Merge pull request #17 from writeas/include-cli

Embed CLI

Author: thebaer

.gitignore

@@ -4,3 +4,4 @@
 build
 .ninja_*
 build.ninja
+data/writeas

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/github.com/writeas/writeas-cli"]
+	path = src/github.com/writeas/writeas-cli
+	url = https://github.com/writeas/writeas-cli.git

build-cli.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+exec_name=writeas
+
+echo "Building $exec_name CLI..."
+gb build github.com/writeas/writeas-cli/cmd/writeas
+echo "Success."

data/meson.build

@@ -15,4 +15,3 @@ install_data('com.github.writeas.writeas-gtk.desktop',
     install_dir: join_paths(get_option('datadir'), 'applications'))
 install_data('com.github.writeas.writeas-gtk.appdata.xml',
     install_dir: join_paths(get_option('datadir'), 'metainfo'))
-install_data('writeas', install_dir: get_option('bindir'))

data/writeas

@@ -6,11 +6,13 @@ Build-Depends: meson,
                debhelper (>= 9),
                libgtk-3-dev,
                libgtksourceview-3.0-dev,
-               valac (>= 0.36)
+               valac (>= 0.36),
+               golang-go,
+               gb
 Standards-Version: 3.9.3
 
 Package: com.github.writeas.writeas-gtk
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, writeas-cli
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: fonts-lora, fonts-open-sans, fonts-hack
 Description: A distraction free and private writing tool, with built-in publishing.

debian/control

@@ -22,10 +22,12 @@ override_dh_auto_configure:
 	cd debian/build && meson --prefix=/usr ../..
 
 override_dh_auto_build:
-	cd debian/build && ninja -v
+	cd debian/build && ninja -v && ninja build
 
 override_dh_auto_test:
 	cd debian/build && ninja test
 
 override_dh_auto_install:
 	cd debian/build && DESTDIR=${CURDIR}/debian/com.github.writeas.writeas-gtk ninja install
+	mkdir -p debian/com.github.writeas.writeas-gtk/usr/bin
+	cp bin/writeas debian/com.github.writeas.writeas-gtk/usr/bin/

debian/rules

@@ -9,5 +9,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')
 
+run_target('build', command: 'build-cli.sh')
+
 subdir('data')
 subdir('src')

meson.build

@@ -0,0 +1,22 @@
+Copyright (c) 2012, Hailiang Wang. All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met: 
+
+ * Redistributions of source code must retain the above copyright notice, this 
+list of conditions and the following disclaimer. 
+
+ * Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

src/code.as/core/socks/LICENSE

@@ -0,0 +1,58 @@
+SOCKS
+=====
+
+[![GoDoc](https://godoc.org/code.as/core/socks?status.svg)](https://godoc.org/code.as/core/socks)
+
+SOCKS is a SOCKS4, SOCKS4A and SOCKS5 proxy package for Go, forked from [h12w/socks](https://github.com/h12w/socks) and patched so it's `go get`able.
+
+## Quick Start
+### Get the package
+
+    go get -u "code.as/core/socks"
+
+### Import the package
+
+    import "code.as/core/socks"
+
+### Create a SOCKS proxy dialing function
+
+    dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, "127.0.0.1:1080")
+    tr := &http.Transport{Dial: dialSocksProxy}
+    httpClient := &http.Client{Transport: tr}
+
+## Example
+
+```go
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+
+	"code.as/core/socks"
+)
+
+func main() {
+	dialSocksProxy := socks.DialSocksProxy(socks.SOCKS5, "127.0.0.1:1080")
+	tr := &http.Transport{Dial: dialSocksProxy}
+	httpClient := &http.Client{Transport: tr}
+	resp, err := httpClient.Get("http://www.google.com")
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		log.Fatal(resp.StatusCode)
+	}
+	buf, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println(string(buf))
+}
+```
+
+## Alternatives
+http://godoc.org/golang.org/x/net/proxy