tugboat 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae578da8803eb53d3b66af1565cde4be593b2ea
-  data.tar.gz: cf7ee510146edd0c175977a948614ace35708bf7
+  metadata.gz: f30609ec594ea66af927054753773df577581965
+  data.tar.gz: 8c3a0372b25f175eb12cd372edb8f518fa36fb8c
 SHA512:
-  metadata.gz: 187a3f8992f56d41067988fb5091cf3879cf80064482fb1f75006daa11bcf078f081a6f7ec7cbcb3b6c44befe8ed09f12e2bf0a5967fc45e03e2fe9938752fc3
-  data.tar.gz: 0cee5b5abfd7ec9eaa00308dc1e38fae7132edd0187fa7a6a4b2bfa1bdb6c1909c81f9f959f06cc4796c9cca36a049f8381fbc939d03cbd955cd5a29a470138f
+  metadata.gz: 6a288744e5b47ccdc56a23eff3c9bf3a2bb13a0b631a0a3948c35cd4217600e9db0da6690ab9ba21c2506ca6e55148823ef5764d5968aa6766b31ee1519285c0
+  data.tar.gz: 898efe785343d19d4827b36bc098dfc6136187db488231e031e6d51a966ec1eda8e78872aa7d4f4d307f5c56e9e6bec0c30d18b218de52abcc784a76a2392168

data/CHANGELOG.md

@@ -2,7 +2,27 @@
 
 ## [Unreleased](https://github.com/pearkes/tugboat/tree/HEAD)
 
-[Full Changelog](https://github.com/pearkes/tugboat/compare/v0.2.0...HEAD)
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v1.1.0...HEAD)
+
+**Fixed bugs:**
+
+- SSH to Private IP [\#169](https://github.com/pearkes/tugboat/issues/169)
+
+**Closed issues:**
+
+- Unable to bundle to run tugboat from git repo version for testing  [\#171](https://github.com/pearkes/tugboat/issues/171)
+
+**Merged pull requests:**
+
+- Update ssh to private ip [\#172](https://github.com/pearkes/tugboat/pull/172) ([petems](https://github.com/petems))
+
+**Closed issues:**
+
+- 1.0.0 Release [\#125](https://github.com/pearkes/tugboat/issues/125)
+
+## [v1.0.0](https://github.com/pearkes/tugboat/tree/v1.0.0) (2015-05-26)
+
+[Full Changelog](https://github.com/pearkes/tugboat/compare/v0.2.0...v1.0.0)
 
 **Implemented enhancements:**
 

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 group :development do
   # Random order is not in the Aruba Cucumber yet...
-  gem 'cucumber', git: 'https://github.com/cucumber/cucumber.git', tag: 'v2.0.0.beta.2'
-  gem 'cucumber-core', git: 'https://github.com/cucumber/cucumber-core.git', tag: 'v1.0.0.beta.2'
+  gem 'cucumber', git: 'https://github.com/cucumber/cucumber-ruby.git', tag: 'v2.0.2'
+  gem 'cucumber-core', git: 'https://github.com/cucumber/cucumber-ruby-core.git', tag: 'v1.2.0'
 end

data/lib/tugboat/cli.rb

@@ -99,10 +99,10 @@ module Tugboat
                   :type => :string,
                   :aliases => "-p",
                   :desc => "The custom SSH Port to connect to"
-    method_option "use_public_ip",
+    method_option "use_private_ip",
                   :type => :boolean,
-                  :aliases => "-e",
-                  :desc => "Use public IP while private IP is present"
+                  :aliases => "-t",
+                  :desc => "Use Private IP while private IP is present"
     method_option "ssh_user",
                   :type => :string,
                   :aliases => "-u",
@@ -122,7 +122,7 @@ module Tugboat
         "user_droplet_fuzzy_name" => name,
         "user_droplet_ssh_port" => options[:ssh_port],
         "user_droplet_ssh_user" => options[:ssh_user],
-        "user_droplet_use_public_ip" => options[:use_public_ip],
+        "user_droplet_use_private_ip" => options[:use_public_ip],
         "user_droplet_ssh_opts" => options[:ssh_opts],
         "user_droplet_ssh_command" => options[:ssh_command],
         "user_quiet" => options[:quiet]

data/lib/tugboat/middleware/ssh_droplet.rb

@@ -27,14 +27,15 @@ module Tugboat
 
         host_ip = env["droplet_ip"]
 
-        if env["droplet_ip_private"]
-          use_public_ip = env["config"].use_public_ip
-
-          if not env["user_droplet_use_public_ip"].nil?
-            use_public_ip = env["user_droplet_use_public_ip"]
-          end
+        if env["user_droplet_use_private_ip"] && env["droplet_ip_private"].nil?
+          say "You asked to ssh to the private IP, but no Private IP found!", :red
+          exit 1
+        end
 
-          if not use_public_ip
+        if env["droplet_ip_private"]
+          say "This droplet has a private IP, checking if you asked to use the Private IP..."
+          if env["user_droplet_use_private_ip"]
+            say "You did! Using private IP for ssh..."
             host_ip = env["droplet_ip_private"]
           end
         end

data/lib/tugboat/version.rb

@@ -1,3 +1,3 @@
 module Tugboat
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/middleware/ssh_droplet_spec.rb

@@ -17,10 +17,9 @@ describe Tugboat::Middleware::SSHDroplet do
                         "-o", "UserKnownHostsFile=/dev/null",
                         "-i", File.expand_path(ssh_key_path),
                         "-p", ssh_port,
-                        "#{ssh_user}@#{droplet_ip_private}")
+                        "#{ssh_user}@#{droplet_ip}")
 
       env["droplet_ip"] = droplet_ip
-      env["droplet_ip_private"] = droplet_ip_private
       env["config"] = config
 
       described_class.new(app).call(env)
@@ -50,9 +49,7 @@ describe Tugboat::Middleware::SSHDroplet do
       described_class.new(app).call(env)
     end
 
-    it "executes ssh using public ip setting from config" do
-      config.data["use_public_ip"] = true
-
+    it "executes ssh with private IP if option chosen" do
       expect(Kernel).to receive(:exec).with("ssh",
                         "-o", "IdentitiesOnly=yes",
                         "-o", "LogLevel=ERROR",
@@ -60,15 +57,37 @@ describe Tugboat::Middleware::SSHDroplet do
                         "-o", "UserKnownHostsFile=/dev/null",
                         "-i", File.expand_path(ssh_key_path),
                         "-p", ssh_port,
-                        "#{ssh_user}@#{droplet_ip}")
+                        "-e",
+                        "-q",
+                        "-X",
+                        "#{ssh_user}@#{droplet_ip_private}",
+                        "echo hello")
 
       env["droplet_ip"] = droplet_ip
       env["droplet_ip_private"] = droplet_ip_private
       env["config"] = config
+      env["user_droplet_ssh_command"] = "echo hello"
+      env["user_droplet_use_private_ip"] = true
+      env["user_droplet_ssh_opts"] = "-e -q -X"
 
       described_class.new(app).call(env)
     end
 
+    it "errors if private IP option given but no Private IP on Droplet" do
+      env["droplet_ip"] = droplet_ip
+      env["config"] = config
+      env["user_droplet_ssh_command"] = "echo hello"
+      env["user_droplet_use_private_ip"] = true
+      env["user_droplet_ssh_opts"] = "-e -q -X"
+
+      expect {described_class.new(app).call(env)}.to raise_error(SystemExit)
+
+      expect($stdout.string).to eq <<-eos
+Executing SSH ...
+You asked to ssh to the private IP, but no Private IP found!
+      eos
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tugboat
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jack Pearkes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A command line tool for interacting with your DigitalOcean droplets.