proxyconf 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjA5ZjAxMmM3ZGU5MDcwMDUxODU4ZjJkNjc4ZTVmMWYwNmRhOWU1Mw==
-  data.tar.gz: !binary |-
-    ZjI2ZDNmOGY2NWIxMDRhM2NmODZmZWVhMjY2MTcwZGE3NGNiZDIyNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjA3ODEzZDAxNDhmYzQ4MGVhYmNkN2MwNjBiOGIzNDk4NTdkNjg2NzdhYjJl
-    MjU4OWU5YWM0ZDZiMTVlN2I0N2U5NGZiN2YwNjNkNjliMTJjYjM4OWRiN2Qy
-    NTUxMmNiOWQxYmJhODhkYjIzMDlmNWJhYWY2ZTlhNmJlMzA4MTg=
-  data.tar.gz: !binary |-
-    MDY1NTI2ZjNiN2EzNTY3YWY5MWNmOGY0YTQwNzA5M2FhZWZmN2ZjNzYxMmQ1
-    MmUzNzVmODQ4N2ExNGMxNjA5NmY1M2M2YjM1OTE5Y2RiMjE2ZjYyMTFhODM5
-    YmFhZjUzM2QzY2ZlMDUyNThjNGU1NzBkNTMyODdmOGUxNWFmMmQ=
+SHA1:
+  metadata.gz: 600560f03316c3df570651c9a0d53b90b4a8065e
+  data.tar.gz: 03c148bc6da776379c9cf454d57b40f2d7e7e68c
+SHA512:
+  metadata.gz: 569ffa06b47bacabd24edcb1d65cbcacac74c5566d1b026a71a2fbcf791ae512ff0a3243b3161ad070b60e8c5cc78667b3b598485e516e1b25f116a76d0d8f56
+  data.tar.gz: 17957483d63153481c9547fb363a6af73e59623c860a7c75090f03898f06d3f15e7adb1832027feb7b3d19872d5af8ff7b476083b4af26aadf8ec043d99795b4

data/README.md

@@ -1,9 +1,11 @@
 # proxyconf
 
 proxyconf is a proxy switcher for terminal.
+proxyconf automatically switch proxy depends on System Preference by default.
 
 proxyconf currently supports Mac only.
 
+
 ## Installation
 
 First, install proxyconf via gem.
@@ -15,6 +17,19 @@ Second, setup using proxyconf-setup command
     $ proxyconf-setup
 
 then it creates ~/.proxyconf directory and append setting for proxyconf into your ~/.bash_profile.
+You can use proxyconf command when you open new terminal, or type below to use immediately.
+
+    $ source "$HOME/.proxyconf/proxyconf"
+
+
+## Update from previous version
+
+If you use previous version of proxyconf, follow steps below to update.
+
+    $ gem update proxyconf
+    $ proxyconf-setup update
+    $ source "$HOME/.proxyconf/proxyconf"
+
 
 ## Usage
 
@@ -24,6 +39,29 @@ Simply type proxyconf in your terminal.
 
 Then proxyconf exports environment variable 'http_proxy', 'https_proxy' and 'ftp_proxy' based on your system preference.
 
+If you want to use other proxy, use 'add' and 'use' command.
+
+    $ proxyconf add other other.proxy.com:8080
+    $ proxyconf use other
+
+'add' command creates new proxy setting, and 'use' command exports environment variables.
+You can check out proxy settings already added using 'list' and 'info' command.
+
+    $ proxyconf list
+    current
+    other
+    $ proxyconf info other
+    export http_proxy=other.proxy.com:8080
+    export ftp_proxy=other.proxy.com:8080
+    export https_proxy=other.proxy.com:8080
+
+You can remove proxy setting using 'remove' command.
+
+    $ proxyconf remove other
+    $ proxyconf list
+    current
+
+
 ## Contributing
 
 1. Fork it

data/bin/proxyconf-setup

@@ -5,12 +5,23 @@ require 'fileutils'
 HOME = File.expand_path('~')
 PROXYCONF_HOME = "#{HOME}/.proxyconf"
 
+def create_proxyconf_sh
+  target = File.expand_path(File.join(File.dirname(__FILE__), "../script/proxyconf"))
+  link = File.join(PROXYCONF_HOME, "proxyconf")
+  if File.exist?(link)
+    File.delete link
+  elsif File.symlink? link
+    File.unlink link
+  end
+  File.symlink(target, link)
+end
+
 # copy template files into ~/.proxyconf
 def create_proxyconf_home
   FileUtils.mkdir_p PROXYCONF_HOME
+  create_proxyconf_sh
   template_path = File.join(File.dirname(__FILE__), '../template')
   src = [
-    File.join(template_path, "proxyconf"),
     File.join(template_path, "proxies")
   ]
   FileUtils.cp_r(src, PROXYCONF_HOME)
@@ -42,4 +53,16 @@ def setup
   update_bashconfig
 end
 
-setup
+def update
+  create_proxyconf_sh
+end
+
+subcommand = ARGV[0]
+case subcommand
+when nil
+  setup
+when 'update'
+  update
+else
+  puts "unknown subcommand: #{subcommand}"
+end

data/lib/proxyconf.rb

@@ -1,10 +1,24 @@
 require "proxyconf/version"
+require "proxyconf/engine"
 require "proxyconf/cli"
 
 module ProxyConf
+  HOME        = "#{File.expand_path('~')}/.proxyconf"
+  PROXIES_DIR = "proxies"
 end
 
-if true
+proxies_dir_path = File.join(ProxyConf::HOME, ProxyConf::PROXIES_DIR)
+unless File.exist? proxies_dir_path
+  puts "proxyconf home not found. do 'proxyconf-setup' first."
+  exit 1
+end
+
+case RbConfig::CONFIG['host_os']
+when /darwin/
+  # MacOSX
   require "proxyconf/mac"
   ProxyConf::Cli.engine = ProxyConf::Mac.new
+else
+  puts 'your operating system is not supported, sorry.'
+  exit 1
 end

data/lib/proxyconf/cli.rb

@@ -12,16 +12,36 @@ module ProxyConf
       engine.export
     end
 
+    desc 'add name proxy', 'add proxy setting into ~/.proxyconf/proxies'
+    def add(name, proxy)
+      engine.add(name, proxy)
+    end
+
+    desc 'remove name', 'remove proxy specified by name'
+    def remove(name)
+      engine.remove(name)
+    end
+
+    desc 'info', 'show proxy setting for specifed name'
+    def info(name)
+      engine.info(name)
+    end
+
+    desc 'list', 'list all proxy settings'
+    def list
+      engine.list
+    end
+
+    desc 'version', 'show version'
+    def version
+      puts ProxyConf::VERSION
+    end
+
     desc 'active_network', 'show active network service name'
     def active_network
       puts engine.active_network
     end
 
-    desc 'test', 'test'
-    def proxy_info
-      puts engine.proxy_info
-    end
-
     private
     def engine
       self.class.engine

data/lib/proxyconf/engine.rb

@@ -0,0 +1,62 @@
+require 'uri'
+
+module ProxyConf
+  class Engine
+    def add(name, proxy)
+      validate_name name
+      validate_uri proxy
+      filepath = File.join(ProxyConf::HOME, ProxyConf::PROXIES_DIR, name)
+      File.open(filepath, "w") do |file|
+        file.puts "export http_proxy=#{proxy}"
+        file.puts "export ftp_proxy=#{proxy}"
+        file.puts "export https_proxy=#{proxy}"
+      end
+    end
+
+    def remove(name)
+      if_exists(name) do |filepath|
+        File.delete(filepath)
+      end
+    end
+
+    def info(name)
+      if_exists(name) do |filepath|
+        puts File.read(filepath)
+      end
+    end
+
+    def list
+      path = File.join(ProxyConf::HOME, ProxyConf::PROXIES_DIR, "*")
+      Dir.glob(path).each do |filepath|
+        puts File.basename(filepath)
+      end
+    end
+
+    protected
+
+    def validate_name(name)
+      unless name =~ /^[0-9a-zA-Z_\-]*$/
+        $stderr.puts "invalid name: #{name}"
+        exit 1
+      end
+    end
+
+    def validate_uri(uri)
+      begin
+        URI.parse(uri)
+      rescue URI::InvalidURIError
+        $stderr.puts "invalid proxy uri: #{uri}"
+        exit 1
+      end
+    end
+
+    def if_exists(name, &block)
+      filepath = File.join(ProxyConf::HOME, ProxyConf::PROXIES_DIR, name)
+      if File.exist? filepath
+        block.call(filepath)
+      else
+        $stderr.puts "no such proxy name: #{name}"
+      end
+    end
+  end
+end

data/lib/proxyconf/mac.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module ProxyConf
-  class Mac
+  class Mac < ProxyConf::Engine
     private
 
     def scutil_query(key)
@@ -11,7 +11,6 @@ get #{key}
 d.show
 close
       EOF
-      #return
       IO.popen("scutil", "r+") do |io|
         io.puts send_data
         io.close_write

data/lib/proxyconf/version.rb

@@ -1,3 +1,3 @@
 module ProxyConf
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/proxyconf.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = ProxyConf::VERSION
   spec.authors       = ["daixque"]
   spec.email         = ["daixque@gmail.com"]
-  spec.description   = %q{proxyconf configurates proxy setting of terminal.}
+  spec.description   = %q{proxyconf configurates proxy setting for terminal depends on System Preference.}
   spec.summary       = %q{proxy switcher for terminal}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/daixque/proxyconf"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/script/proxyconf

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+PROXYCONF_CMD=proxyconf-core
+PROXYCONF_HOME=~/.proxyconf
+
+__proxyconf_usage ()
+{
+  cat <<EOF
+usage:
+  $ proxyconf [command]
+
+  if command is not given, 'update' command will used.
+
+commands:
+  update
+    update proxy setting for active network service.
+  help
+    show usage
+  add name proxy
+    add proxy setting into ~/.proxyconf/proxies
+  remove name
+    remove proxy specified by name
+  info name
+    show proxy setting for specifed name
+  list
+    list all proxy settings
+  use name
+    update proxy setting specified by name
+EOF
+}
+
+__proxyconf_use ()
+{
+  target_proxy_file=$PROXYCONF_HOME/proxies/$1
+  if ! [[ -f $target_proxy_file ]] ; then
+    echo 'no such proxy name:' $1 >&2
+    exit 1
+  fi
+  . $target_proxy_file
+  echo "set proxy:" $http_proxy
+}
+
+__proxyconf_update ()
+{
+  $PROXYCONF_CMD export > $PROXYCONF_HOME/proxies/current
+  __proxyconf_use current
+}
+
+__proxyconf_deligate ()
+{
+  $PROXYCONF_CMD $*
+}
+
+proxyconf ()
+{
+  case $1 in
+    "")       __proxyconf_update ;;
+    "update") __proxyconf_update ;;
+    "help")   __proxyconf_usage ;;
+    "add")    __proxyconf_deligate $* ;;
+    "remove") __proxyconf_deligate $* ;;
+    "info")   __proxyconf_deligate $* ;;
+    "list")   __proxyconf_deligate $* ;;
+    "use")    __proxyconf_use $2 ;;
+    "-v")     $PROXYCONF_CMD version ;;
+    * )
+      echo "unknown command:" $1
+      echo "type 'proxyconf help' to show usage";;
+  esac
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxyconf
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - daixque
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,31 +28,31 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: proxyconf configurates proxy setting of terminal.
+description: proxyconf configurates proxy setting for terminal depends on System Preference.
 email:
 - daixque@gmail.com
 executables:
@@ -70,13 +70,13 @@ files:
 - bin/proxyconf-setup
 - lib/proxyconf.rb
 - lib/proxyconf/cli.rb
+- lib/proxyconf/engine.rb
 - lib/proxyconf/mac.rb
-- lib/proxyconf/sh.rb
 - lib/proxyconf/version.rb
 - proxyconf.gemspec
+- script/proxyconf
 - template/proxies/current
-- template/proxyconf
-homepage: ''
+homepage: https://github.com/daixque/proxyconf
 licenses:
 - MIT
 metadata: {}
@@ -86,12 +86,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/proxyconf/sh.rb

@@ -1,4 +0,0 @@
-module ProxyConf
-  module Sh
-  end
-end

data/template/proxyconf

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-PROXYCONF_CMD=proxyconf-core
-PROXYCONF_HOME=~/.proxyconf
-
-__proxyconf_usage ()
-{
-  cat <<EOF
-usage:
-  $ proxyconf [command]
-
-  if command is not given, 'update' command will used.
-
-commands:
-  update
-    update proxy setting for active network service.
-  help
-    show usage
-EOF
-}
-
-__proxyconf_use ()
-{
-  . $PROXYCONF_HOME/proxies/$1
-  echo "set proxy:" $http_proxy
-
-}
-
-__proxyconf_update ()
-{
-  $PROXYCONF_CMD export > $PROXYCONF_HOME/proxies/current
-  __proxyconf_use current
-}
-
-proxyconf ()
-{
-  case $1 in
-    "")       __proxyconf_update ;;
-    "update") __proxyconf_update ;;
-    "help")   __proxyconf_usage ;;
-    * )
-      echo "unknown command:" $1
-      echo "type 'proxyconf help' to show usage";;
-  esac
-}