knife-server 1.1.0 → 1.2.0

data/spec/knife/server/ec2_security_group_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Copyright:: Copyright (c) 2012 Fletcher Nichol
@@ -16,19 +17,19 @@
 # limitations under the License.
 #
 
-require 'knife/server/ec2_security_group'
+require "knife/server/ec2_security_group"
 
 describe Knife::Server::Ec2SecurityGroup do
-  let(:connection)  { stub }
-  let(:ui)          { stub.as_null_object }
-  let(:group)       { stub(:name => "mygroup") }
+  let(:connection)  { double }
+  let(:ui)          { double.as_null_object }
+  let(:group)       { double(:name => "mygroup") }
 
   subject do
     Knife::Server::Ec2SecurityGroup.new(connection, ui)
   end
 
   def stub_groups!
-    connection.stub(:security_groups) { [group] }
+    allow(connection).to receive(:security_groups) { [group] }
   end
 
   describe "#find_or_create" do
@@ -38,11 +39,11 @@ describe Knife::Server::Ec2SecurityGroup do
       end
 
       it "returns the group" do
-        subject.find_or_create("mygroup").should eq(group)
+        expect(subject.find_or_create("mygroup")).to eq(group)
       end
 
       it "sends a message to the ui" do
-        ui.should_receive(:msg).with("EC2 security group 'mygroup' exists")
+        expect(ui).to receive(:msg).with("EC2 security group 'mygroup' exists")
 
         subject.find_or_create("mygroup")
       end
@@ -50,18 +51,24 @@ describe Knife::Server::Ec2SecurityGroup do
 
     context "when the group does not exist" do
       before do
-        connection.stub(:security_groups) { [stub(:name => "nope")] }
-        connection.stub(:create_security_group).
-          with("mygroup", "the best") { stub_groups! ; true }
+        allow(connection).to receive(:security_groups) do
+          [double(:name => "nope")]
+        end
+        allow(connection).to receive(:create_security_group).
+          with("mygroup", "the best") do
+            stub_groups!
+            true
+          end
       end
 
       it "returns a new group" do
-        subject.find_or_create("mygroup", :description => "the best").
-          should eq(group)
+        expect(subject.find_or_create("mygroup", :description => "the best")).
+          to eq(group)
       end
 
       it "sends a message to the ui" do
-        ui.should_receive(:msg).with("Creating EC2 security group 'mygroup'")
+        expect(ui).to receive(:msg).
+          with("Creating EC2 security group 'mygroup'")
 
         subject.find_or_create("mygroup", :description => "the best")
       end
@@ -72,110 +79,111 @@ describe Knife::Server::Ec2SecurityGroup do
     context "with no permissions set" do
       before do
         stub_groups!
-        group.stub(:ip_permissions) { [] }
-        group.stub(:owner_id) { '123' }
-        connection.stub(:authorize_security_group_ingress)
+        allow(group).to receive(:ip_permissions) { [] }
+        allow(group).to receive(:owner_id) { "123" }
+        allow(connection).to receive(:authorize_security_group_ingress)
       end
 
       it "adds an icmp wildcard rule for the security group" do
-        connection.should_receive(:authorize_security_group_ingress).
-          with("mygroup", {
-            'IpPermissions' => [
-              { 'FromPort' => -1, 'ToPort' => -1, 'IpProtocol' => 'icmp',
-                'Groups' => [{ 'GroupName' => 'mygroup', 'UserId' => '123' }]
-              }
-            ]
-          })
+        expect(connection).to receive(:authorize_security_group_ingress).with(
+          "mygroup",
+          "IpPermissions" => [
+            { "FromPort" => -1, "ToPort" => -1, "IpProtocol" => "icmp",
+              "Groups" => [{ "GroupName" => "mygroup", "UserId" => "123" }]
+            }
+          ]
+        )
 
-        subject.configure_chef_server_group('mygroup')
+        subject.configure_chef_server_group("mygroup")
       end
 
       it "send a message for the icmp wildcard rule" do
-        ui.should_receive(:msg).
+        expect(ui).to receive(:msg).
           with("Creating inbound security group rule for icmp(-1 -> -1)")
 
-        subject.configure_chef_server_group('mygroup')
+        subject.configure_chef_server_group("mygroup")
       end
 
-      %w{tcp udp}.each do |proto|
+      %w[tcp udp].each do |proto|
         it "adds a #{proto} rule for the security group" do
-          connection.should_receive(:authorize_security_group_ingress).
-            with("mygroup", {
-              'IpPermissions' => [
-                { 'IpProtocol' => proto,
-                  'FromPort' => 0, 'ToPort' => 65535,
-                  'Groups' => [{ 'GroupName' => 'mygroup', 'UserId' => '123' }]
-                }
-              ]
-            })
+          expect(connection).to receive(:authorize_security_group_ingress).with(
+            "mygroup",
+            "IpPermissions" => [
+              { "IpProtocol" => proto,
+                "FromPort" => 0, "ToPort" => 65535,
+                "Groups" => [{ "GroupName" => "mygroup", "UserId" => "123" }]
+              }
+            ]
+          )
 
-          subject.configure_chef_server_group('mygroup')
+          subject.configure_chef_server_group("mygroup")
         end
 
         it "send a message for the #{proto} security group rule" do
-          ui.should_receive(:msg).with("Creating inbound security group " +
-            "rule for #{proto}(0 -> 65535)")
+          expect(ui).to receive(:msg).with(
+            "Creating inbound security group rule for #{proto}(0 -> 65535)")
 
-          subject.configure_chef_server_group('mygroup')
+          subject.configure_chef_server_group("mygroup")
         end
       end
 
       [22, 443, 444].each do |tcp_port|
         it "adds a tcp rule to port #{tcp_port} from anywhere" do
-          connection.should_receive(:authorize_security_group_ingress).
-            with("mygroup", {
-              'IpPermissions' => [
-                { 'IpProtocol' => 'tcp',
-                  'FromPort' => tcp_port, 'ToPort' => tcp_port,
-                  'IpRanges' => [{ 'CidrIp' => '0.0.0.0/0' }]
+          expect(connection).to receive(:authorize_security_group_ingress).
+            with("mygroup",
+              "IpPermissions" => [
+                { "IpProtocol" => "tcp",
+                  "FromPort" => tcp_port, "ToPort" => tcp_port,
+                  "IpRanges" => [{ "CidrIp" => "0.0.0.0/0" }]
                 }
               ]
-            })
+            )
 
-          subject.configure_chef_server_group('mygroup')
+          subject.configure_chef_server_group("mygroup")
         end
 
         it "send a message for the tcp/#{tcp_port} rule" do
-          ui.should_receive(:msg).with("Creating inbound security group " +
+          expect(ui).to receive(:msg).with("Creating inbound security group " \
             "rule for tcp(#{tcp_port} -> #{tcp_port})")
 
-          subject.configure_chef_server_group('mygroup')
+          subject.configure_chef_server_group("mygroup")
         end
       end
     end
 
     describe "with all permissions set" do
       def stub_perm!(proto, from, to)
-        { 'ipProtocol' => proto, 'fromPort' => from, 'toPort' => to }
+        { "ipProtocol" => proto, "fromPort" => from, "toPort" => to }
       end
 
       before do
         stub_groups!
-        group.stub(:ip_permissions) do
-          [ stub_perm!('icmp', -1, -1), stub_perm!('tcp', 0, 65535),
-            stub_perm!('udp', 0, 65535), stub_perm!('tcp', 22, 22),
-            stub_perm!('tcp', 443, 443), stub_perm!('tcp', 444, 444)
+        allow(group).to receive(:ip_permissions) do
+          [
+            stub_perm!("icmp", -1, -1), stub_perm!("tcp", 0, 65535),
+            stub_perm!("udp", 0, 65535), stub_perm!("tcp", 22, 22),
+            stub_perm!("tcp", 443, 443), stub_perm!("tcp", 444, 444)
           ]
         end
-        group.stub(:owner_id) { '123' }
-        connection.stub(:authorize_security_group_ingress)
+        allow(group).to receive(:owner_id) { "123" }
+        allow(connection).to receive(:authorize_security_group_ingress)
       end
 
       it "does not add permissions" do
-        connection.should_not_receive(:authorize_security_group_ingress)
+        expect(connection).to_not receive(:authorize_security_group_ingress)
 
-        subject.configure_chef_server_group('mygroup')
+        subject.configure_chef_server_group("mygroup")
       end
 
       it "sends messages for the rules" do
-        ui.should_receive(:msg).with("Inbound security group rule " +
-          "icmp(-1 -> -1) exists")
-        ui.should_receive(:msg).with("Inbound security group rule " +
-          "tcp(0 -> 65535) exists")
-        ui.should_receive(:msg).with("Inbound security group rule " +
-          "tcp(22 -> 22) exists")
-
-        subject.configure_chef_server_group('mygroup')
+        expect(ui).to receive(:msg).
+          with("Inbound security group rule icmp(-1 -> -1) exists")
+        expect(ui).to receive(:msg).
+          with("Inbound security group rule tcp(0 -> 65535) exists")
+        expect(ui).to receive(:msg).
+          with("Inbound security group rule tcp(22 -> 22) exists")
+
+        subject.configure_chef_server_group("mygroup")
       end
     end
   end

data/spec/knife/server/ssh_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Copyright:: Copyright (c) 2012 Fletcher Nichol
@@ -16,66 +17,181 @@
 # limitations under the License.
 #
 
-require 'knife/server/ssh'
+require "net/ssh/test"
+
+require "knife/server/ssh"
+
+# Terrible hack to deal with Net::SSH:Test::Extensions which monkey patches
+# `IO.select` with a version for testing Net::SSH code. Unfortunetly this
+# impacts other code, so we'll "un-patch" this after each spec and "re-patch"
+# it before the next one.
+
+def depatch_io
+  IO.class_exec do
+    class << self
+      alias_method :select, :select_for_real
+    end
+  end
+end
+
+def repatch_io
+  IO.class_exec do
+    class << self
+      alias_method :select, :select_for_test
+    end
+  end
+end
+
+# Major hack-and-a-half to add basic `Channel#request_pty` support to
+# Net::SSH's testing framework. The `Net::SSH::Test::LocalPacket` does not
+# recognize the `"pty-req"` request type, so bombs out whenever this channel
+# request is sent.
+#
+# This "make-work" fix adds a method (`#sends_request_pty`) which works just
+# like `#sends_exec` expcept that it enqueues a patched subclass of
+# `LocalPacket` which can deal with the `"pty-req"` type.
+#
+# An upstream patch to Net::SSH will be required to retire this yak shave ;)
+
+module Net
+  module SSH
+    module Test
+      # Dat monkey patch
+      class Channel
+        def sends_request_pty
+          pty_data = ["xterm", 80, 24, 640, 480, "\0"]
+
+          script.events << Class.new(Net::SSH::Test::LocalPacket) do
+            def types
+              if @type == 98 && @data[1] == "pty-req"
+                @types ||= [
+                  :long, :string, :bool, :string,
+                  :long, :long, :long, :long, :string
+                ]
+              else
+                super
+              end
+            end
+          end.new(:channel_request, remote_id, "pty-req", false, *pty_data)
+        end
+      end
+    end
+  end
+end
+
+# Quick-and-dirty port of MiniTest's assert method, needed for Net::SSH:Test's
+# #assert_scripted method
+def assert(test, msg = nil)
+  unless test
+    msg ||= "Failed assertion, no message given."
+    msg = msg.call if Proc == msg
+    raise msg
+  end
+  true
+end
 
 describe Knife::Server::SSH do
+  include Net::SSH::Test
+
   let(:ssh_options) do
     { :host => "wadup.example.com", :user => "bob",
       :keys => "/tmp/whoomp.key", :port => "2222" }
   end
 
-  let(:ssh_connection) do
-    stub("SSH connection").as_null_object
-  end
+  let(:ssh_connection) { connection }
 
   subject { Knife::Server::SSH.new(ssh_options) }
 
   before do
-    Net::SSH.stub(:start).and_yield(ssh_connection)
+    repatch_io
+    allow(Net::SSH).to receive(:start).and_yield(ssh_connection)
   end
 
-  it "passes ssh options to ssh sessions" do
-    Net::SSH.should_receive(:start).with("wadup.example.com", "bob",
-      { :keys => "/tmp/whoomp.key", :port => "2222" })
+  after do
+    depatch_io
+  end
 
-    subject.exec! "wat"
+  it "passes ssh options to ssh sessions" do
+    write_story do |channel|
+      channel.sends_exec(
+        %{sudo USER=root HOME="$(getent passwd root | cut -d : -f 6)" } \
+        "bash -c 'wat'"
+      )
+      channel.gets_exit_status(0)
+    end
+    expect(Net::SSH).to receive(:start).with("wadup.example.com", "bob",
+      :keys => "/tmp/whoomp.key", :port => "2222")
+
+    assert_scripted { subject.exec! "wat" }
   end
 
   it "sets default user to root" do
+    write_story do |channel|
+      channel.sends_exec("wat")
+      channel.gets_exit_status(0)
+    end
     ssh_options.delete(:user)
-    Net::SSH.should_receive(:start).
+    expect(Net::SSH).to receive(:start).
       with(anything, "root", anything)
 
-    Knife::Server::SSH.new(ssh_options).exec!("wat")
+    assert_scripted { Knife::Server::SSH.new(ssh_options).exec!("wat") }
   end
 
   it "sets default port to 22" do
+    write_story do |channel|
+      channel.sends_exec(
+        %{sudo USER=root HOME="$(getent passwd root | cut -d : -f 6)" } \
+        "bash -c 'wat'"
+      )
+      channel.gets_exit_status(0)
+    end
     ssh_options.delete(:port)
-    Net::SSH.should_receive(:start).
+    expect(Net::SSH).to receive(:start).
       with(anything, anything, hash_including(:port => "22"))
 
-    Knife::Server::SSH.new(ssh_options).exec!("wat")
+    assert_scripted { Knife::Server::SSH.new(ssh_options).exec!("wat") }
   end
 
   it "does not add sudo to the command if user is root" do
+    write_story do |channel|
+      channel.sends_exec("zappa")
+      channel.gets_exit_status(0)
+    end
     ssh_options[:user] = "root"
-    ssh_connection.should_receive(:exec!).with("zappa")
 
-    Knife::Server::SSH.new(ssh_options).exec!("zappa")
+    assert_scripted { Knife::Server::SSH.new(ssh_options).exec!("zappa") }
   end
 
   it "adds sudo to the command if user is not root" do
-    ssh_connection.should_receive(:exec!).
-      with([%{sudo USER=root HOME="$(getent passwd root | cut -d : -f 6)"},
-           %{bash -c 'zappa'}].join(" "))
-
-    Knife::Server::SSH.new(ssh_options).exec!("zappa")
+    write_story do |channel|
+      channel.sends_exec(
+        %{sudo USER=root HOME="$(getent passwd root | cut -d : -f 6)" } \
+        "bash -c 'zappa'"
+      )
+      channel.gets_exit_status(0)
+    end
+
+    assert_scripted { Knife::Server::SSH.new(ssh_options).exec!("zappa") }
   end
 
   it "returns the output of ssh command" do
+    write_story do |channel|
+      channel.sends_exec("youdoitnow")
+      channel.gets_data("okthen")
+      channel.gets_exit_status(0)
+    end
     ssh_options[:user] = "root"
-    ssh_connection.stub(:exec!).with("youdoitnow") { "okthen" }
 
-    subject.exec!("youdoitnow").should eq("okthen")
+    assert_scripted { expect(subject.exec!("youdoitnow")).to eq("okthen") }
+  end
+
+  def write_story
+    story do |script|
+      channel = script.opens_channel
+      channel.sends_request_pty
+      yield channel if block_given?
+      channel.gets_close
+      channel.sends_close
+    end
   end
 end

metadata

@@ -1,127 +1,197 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   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'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.10
+- !ruby/object:Gem::Dependency
+  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: knife-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.12
 - !ruby/object:Gem::Dependency
   name: knife-linode
   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: knife-openstack
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: countloc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: finstyle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.2
 description: Chef Knife plugin to bootstrap Chef Servers
 email:
 - fnichol@nichol.ca
@@ -129,11 +199,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".cane"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -151,6 +224,7 @@ files:
 - lib/chef/knife/server_bootstrap_base.rb
 - lib/chef/knife/server_bootstrap_ec2.rb
 - lib/chef/knife/server_bootstrap_linode.rb
+- lib/chef/knife/server_bootstrap_openstack.rb
 - lib/chef/knife/server_bootstrap_standalone.rb
 - lib/chef/knife/server_restore.rb
 - lib/knife-server.rb
@@ -161,6 +235,7 @@ files:
 - spec/chef/knife/server_backup_spec.rb
 - spec/chef/knife/server_bootstrap_ec2_spec.rb
 - spec/chef/knife/server_bootstrap_linode_spec.rb
+- spec/chef/knife/server_bootstrap_openstack_spec.rb
 - spec/chef/knife/server_bootstrap_standalone_spec.rb
 - spec/chef/knife/server_restore_spec.rb
 - spec/knife/server/credientials_spec.rb
@@ -175,17 +250,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Chef Knife plugin to bootstrap Chef Servers
@@ -193,6 +268,7 @@ test_files:
 - spec/chef/knife/server_backup_spec.rb
 - spec/chef/knife/server_bootstrap_ec2_spec.rb
 - spec/chef/knife/server_bootstrap_linode_spec.rb
+- spec/chef/knife/server_bootstrap_openstack_spec.rb
 - spec/chef/knife/server_bootstrap_standalone_spec.rb
 - spec/chef/knife/server_restore_spec.rb
 - spec/knife/server/credientials_spec.rb