canals 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df35b01f8f9e53a33d3b7f4f382cf5a7be93e44
-  data.tar.gz: 54eed2eb3f91b7d9c3c0dff54d58fa19ed066062
+  metadata.gz: 45f4994183e88934eb7ed5641324544cc104add8
+  data.tar.gz: 3a512829032993ac8ae25672136b10bb9d5c90ca
 SHA512:
-  metadata.gz: 6678efe399cdd797b6972f9db2f156747d0998b196f08259095e05eba1d22715e9348c883693b48b7aed800fb09a27f70ccbd221a5deb661bfe845ce7c0ad06e
-  data.tar.gz: 27f72678f52e4cf58cf48ff02c3f6cc6ba3896f265e3f211e7d507bc799ba70f186cbedfbc5d27b8109b5cbd6c2fa2d2bfb8921cbcb1d46be203ae1a1e808b89
+  metadata.gz: 9fc53b0c66a2383a2fd2164d3da1398aced964f43d2b0cdda2367802f80c4e9b85830de3cd38a6ae41cefdd07636047404c51ddd98134c85ac9115db53e7c2ff
+  data.tar.gz: d6d29cf4e0db03c81f92c7f70f6a5442e71a82a71f30333285dd8ab4b306f04bc085a021a32f26a0836ad4e5d682b8b296600f0d2ffc25befb0dcdce430e4fb9

data/lib/canals/cli/setup.rb

@@ -21,6 +21,12 @@ module Canals
         install_completion
       end
 
+      desc "bind-address", "Setup a global bind address (defaults to 127.0.0.1)"
+      def bind_address(bind)
+        Canals.config[:bind_address] = bind
+        Canals.config.save!
+      end
+
       no_commands do
         def setup_first_environment
           say "We'll start by setting up your first environment", :green

data/lib/canals/cli.rb

@@ -31,6 +31,29 @@ module Canals
         say "Tunnel #{name.inspect} created.", :green
       end
 
+      desc 'update NAME', "Update an existing tunnel"
+      method_option :remote_host, :type => :string, :desc => "The remote host of the tunnel"
+      method_option :remote_port, :type => :string, :desc => "The remote port of the tunnel"
+      method_option :local_port,  :type => :string, :desc => "The local port to use"
+      method_option :env,         :type => :string, :desc => "The proxy environment to use"
+      method_option :hostname,    :type => :string, :desc => "The proxy host we will use to connect through"
+      method_option :user,        :type => :string, :desc => "The user for the ssh proxy host"
+      def update(name)
+        tunnel = Canals.repository.get(name)
+        if tunnel.nil?
+          say "couldn't find tunnel #{name.inspect}. try using 'create' instead", :red
+          return
+        end
+        if options.empty?
+          say "you need to specify what to update. use `canal help update` to see a list of optional updates"
+          return
+        end
+        opts = tunnel.to_hash.merge(options)
+        opts = Canals::CanalOptions.new(opts)
+        Canals.create_tunnel(opts)
+        say "Tunnel #{name.inspect} updated.", :green
+      end
+
       desc 'start NAME', 'Start tunnel'
       def start(name)
         tstart(name)

data/lib/canals/options.rb

@@ -17,8 +17,13 @@ module Canals
       @env = Canals.repository.environment(@env_name)
     end
 
+    def to_s
+      return "CanalOptions<#{@args}>"
+    end
+
     def bind_address
       return @args["bind_address"] if @args["bind_address"]
+      return Canals.config[:bind_address] if Canals.config[:bind_address]
       return BIND_ADDRESS
     end
 

data/lib/canals/repository.rb

@@ -35,6 +35,7 @@ module Canals
     end
 
     def get(name)
+      return nil if !@repo[:tunnels].has_key? name
       CanalOptions.new(@repo[:tunnels][name])
     end
 

data/lib/canals/version.rb

@@ -1,6 +1,6 @@
 module Canals
 
   # Canals gem current version
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 
 end

data/spec/canals/options_spec.rb

@@ -8,6 +8,7 @@ describe Canals::CanalOptions do
   let(:remote_port) { 1234 }
   let(:local_port)  { 4321 }
   let(:bind_address)  { "1.2.3.4" }
+  let(:global_bind_address)  { "4.3.2.1" }
   let(:hostname)  { "nat.example.com" }
   let(:user)  { "user" }
   let(:pem)  { "/tmp/file.pem" }
@@ -81,16 +82,25 @@ describe Canals::CanalOptions do
 
   describe "bind_address" do
     it "returns 'bind_address' if 'bind_address' is availble" do
-      args = {"name" => name, "remote_host" => remote_host, "remote_port" => remote_port, "local_port" => local_port, "bind_address" => bind_address}
+      allow(Canals.config).to receive(:[]).with(:bind_address).and_return(global_bind_address)
+      args = {"name" => name, "remote_host" => remote_host, "remote_port"=> remote_port, "local_port" => local_port, "bind_address" => bind_address}
       opt = Canals::CanalOptions.new(args)
       expect(opt.bind_address).to eq bind_address
     end
 
-    it "returns 'Canals::CanalOptions::BIND_ADDRESS' for 'bind_address' if 'bind_address' isn't given" do
+    it "returns 'Canals::CanalOptions::BIND_ADDRESS' for 'bind_address' if 'bind_address' isn't given and no global bind_address" do
+      allow(Canals.config).to receive(:[]).with(:bind_address).and_return(nil)
       args = {"name" => name, "remote_host" => remote_host, "remote_port" => remote_port, "local_port" => local_port}
       opt = Canals::CanalOptions.new(args)
       expect(opt.bind_address).to eq Canals::CanalOptions::BIND_ADDRESS
     end
+
+    it "returns 'Canals.config[:bind_address]' for 'bind_address' if 'bind_address' isn't given and global bind_address" do
+      allow(Canals.config).to receive(:[]).with(:bind_address).and_return(global_bind_address)
+      args = {"name" => name, "remote_host" => remote_host, "remote_port" => remote_port, "local_port" => local_port}
+      opt = Canals::CanalOptions.new(args)
+      expect(opt.bind_address).to eq global_bind_address
+    end
   end
 
   describe "environment variables" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canals
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Ido Abramovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor