knife-digital_ocean 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac6a8d976a9d871f7e2fa1222161c81507fd200
-  data.tar.gz: 539ce2c8b87cc060ce438ee95ee8531fee0256df
+  metadata.gz: 332005be8bd3b557afeaf4951fef63555ae0b425
+  data.tar.gz: 627025c5258c0b5536bd624249f7bfd29ac65e4d
 SHA512:
-  metadata.gz: a8d42c7cdd0ad77fe3e4fedee79e9677154f45347f917c74bd2bcdfb76cfc66afb7654fbb613b70681c1e70b695b340540f9dc2998a59f501a5e6f2f9a4d7d01
-  data.tar.gz: 9811fb01af5c753520e8514a6ad3137cf4fe469852427d4eb3b66dbd27b3a88b5704f076b69359da38c3c54fe3b7dfc91215775a64d9c527e96affa0931f72c5
+  metadata.gz: 471b6fa0448224595f7f72ca7e957f75fc6411c858c7ac9c429e283d10d449cac7a3ceff8885e0344d00484390508b0502cae468e1437dbba6b814c776095ea0
+  data.tar.gz: 979834d8308f3ca504eb7b5cd43bdf8e9bc49a3b353352b791d67801956f0bc87384e510458bd9869101e3a5feb6c463dafaf7366e54a54118e3da5b3631800d

data/.gitignore

@@ -5,6 +5,7 @@
 .yardoc
 .chef
 Gemfile.lock
+knife-digital_ocean.gemspec.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## unreleased
 
-* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.6.0...master)
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.7.0...master)
+
+
+## 0.7.0 / 2014-05-21
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.6.0...v0.7.0)
+* added --ssh-port option (thanks @popsikle)
 
 
 ## 0.6.0 / 2014-05-02

data/README.md

@@ -74,6 +74,7 @@ __Examples__
                                       --location 2 \
                                       --size 66 \
                                       --ssh-keys 1234,1235 \
+                                      --ssh-port 22
 ```
 
 ```shell
@@ -85,6 +86,8 @@ __Examples__
                                       --bootstrap \
                                       --run-list "role[base],role[webserver]" \
                                       --secret-file "~/.ssh/secret_file" \
+                                      --ssh-port 22 \
+                                      --identity-file "~/.ssh/id_rsa" \
                                       --private_networking
 ```
 
@@ -96,6 +99,7 @@ __Syntax__
                                       --location <REGION ID> \
                                       --size <SIZE ID> \
                                       --ssh-keys <SSH KEY-ID(s), comma-separated> \
+                                      --ssh-port <SSH PORT> \
                                       --bootstrap \
                                       --run-list "<RUNLIST>" \
                                       --secret-file "<FILENAME>" \
@@ -110,6 +114,7 @@ __Short Syntax__
                                       -L <REGION ID> \
                                       -S <SIZE ID> \
                                       -K <SSH KEY-ID(s), comma-separated> \
+                                      -p <SSH PORT> \
                                       -B \
                                       -r "<RUNLIST>"
 ```

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -138,6 +138,13 @@ class Chef
         :description => "A file containing the secret key to use to encrypt data bag item values",
         :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
+      option :ssh_port,
+        :short => "-p PORT",
+        :long => "--ssh-port PORT",
+        :description => "The ssh port",
+        :default => "22",
+        :proc => Proc.new { |port| Chef::Config[:knife][:ssh_port] = port }
+
       def run
         $stdout.sync = true
 
@@ -203,7 +210,7 @@ class Chef
         puts ui.color("IPv4 address is: #{ip_address}", :green)
 
         print ui.color('Waiting for sshd:', :magenta)
-        print('.') until tcp_test_ssh(ip_address, 22) {
+        print('.') until tcp_test_ssh(ip_address) {
           sleep 2
           puts 'done'
         }
@@ -228,7 +235,8 @@ class Chef
         end
       end
 
-      def tcp_test_ssh(hostname, port)
+      def tcp_test_ssh(hostname)
+        port = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
         tcp_socket = TCPSocket.new(hostname, port)
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
@@ -258,6 +266,7 @@ class Chef
         bootstrap.config.merge! config
         bootstrap.config[:chef_node_name] = locate_config_value(:server_name)
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+        bootstrap.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
         bootstrap.config[:distro] = locate_config_value(:distro)
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:template_file] = locate_config_value(:template_file)

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/spec/lib/chef/knife/digital_ocean_droplet_create_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 def mock_api_response(data = {})
-  Hashie::Rash.new(data)
+  Hashie::Mash.new(data)
 end
 
 describe Chef::Knife::DigitalOceanDropletCreate do
 
   subject {
     s = Chef::Knife::DigitalOceanDropletCreate.new
-    s.stub(:client).and_return mock(DigitalOcean::API)
+    s.stub(:client).and_return double(DigitalOcean::API)
     s
   }
 
@@ -64,8 +64,8 @@ describe Chef::Knife::DigitalOceanDropletCreate do
       let(:subject) {
         s = super()
         s.client.stub_chain(:droplets, :create).and_return mock_api_response(api_response)
-        s.stub!(:ip_address_available).and_return '123.123.123.123'
-        s.stub!(:tcp_test_ssh).and_return true
+        s.stub(:ip_address_available).and_return '123.123.123.123'
+        s.stub(:tcp_test_ssh).and_return true
         s
       }
 
@@ -97,8 +97,8 @@ describe Chef::Knife::DigitalOceanDropletCreate do
       let(:subject) {
         s = super()
         s.client.stub_chain(:droplets, :create).and_return mock_api_response(api_response)
-        s.stub!(:ip_address_available).and_return '123.123.123.123'
-        s.stub!(:tcp_test_ssh).and_return true
+        s.stub(:ip_address_available).and_return '123.123.123.123'
+        s.stub(:tcp_test_ssh).and_return true
         s
       }
 
@@ -136,8 +136,8 @@ describe Chef::Knife::DigitalOceanDropletCreate do
       let(:subject) {
         s = super()
         s.client.stub_chain(:droplets, :create).and_return mock_api_response(api_response)
-        s.stub!(:ip_address_available).and_return '123.123.123.123'
-        s.stub!(:tcp_test_ssh).and_return true
+        s.stub(:ip_address_available).and_return '123.123.123.123'
+        s.stub(:tcp_test_ssh).and_return true
         s
       }
 
@@ -183,5 +183,19 @@ describe Chef::Knife::DigitalOceanDropletCreate do
     end
   end
 
+  context 'passing ssh_port (--ssh-port)' do
+    let(:ssh_port) { 22 }
+    let(:custom_config) {
+      {
+       :ssh_port => ssh_port
+      }
+    }
+
+    it 'ssh_port should be available to Bootstrap' do
+      bootstrap = subject.bootstrap_for_node('123.123.123.123')
+      bootstrap.config[:ssh_port].should eql(ssh_port)
+    end
+  end
+
 end
 

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rspec/autorun'
 
 require 'digital_ocean'
-require 'rash'
+require 'hashie'
 
 require 'chef/knife'
 require 'chef/knife/digital_ocean_droplet_create'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef