chef_cap 0.1.4 → 0.1.5

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/recipes/chef_cap.rb

@@ -46,20 +46,18 @@ if ChefDnaParser.parsed["environments"]
   end
 end
 
-private_key = ssh_deploy_key_file rescue false
-public_key = ssh_authorized_pub_file rescue false
-known_hosts = ssh_known_hosts rescue false
-if private_key || public_key || known_hosts
-  private_key_remote_file = ".ssh/id_rsa"
-  if private_key
-    key_contents = File.read(private_key)
-    private_key_remote_file = ".ssh/id_dsa" if key_contents =~ /DSA/i
-  end
-
-
-  namespace :ssh do
-    desc "Transfer SSH keys to the remote server"
-    task :transfer_keys do
+namespace :ssh do
+  desc "Transfer SSH keys to the remote server"
+  task :transfer_keys do
+    private_key = ssh_deploy_key_file rescue false
+    public_key = ssh_authorized_pub_file rescue false
+    known_hosts = ssh_known_hosts rescue false
+    if private_key || public_key || known_hosts
+      private_key_remote_file = ".ssh/id_rsa"
+      if private_key
+        key_contents = File.read(private_key)
+        private_key_remote_file = ".ssh/id_dsa" if key_contents =~ /DSA/i
+      end
       run "mkdir -p ~/.ssh"
       if private_key
         put(File.read(private_key), private_key_remote_file, :mode => "0600")
@@ -67,18 +65,22 @@ if private_key || public_key || known_hosts
       put(File.read(public_key), ".ssh/authorized_keys", :mode => "0600") if public_key
       put(known_hosts, ".ssh/known_hosts", :mode => "0600") if known_hosts
     end
+    depend(:remote, :file, private_key_remote_file) if private_key
+    depend(:remote, :file, ".ssh/authorized_keys") if public_key
+    depend(:remote, :file, ".ssh/known_hosts") if known_hosts
   end
-  before "chef:setup", "ssh:transfer_keys"
 
-  depend(:remote, :file, private_key_remote_file) if private_key
-  depend(:remote, :file, ".ssh/authorized_keys") if public_key
-  depend(:remote, :file, ".ssh/known_hosts") if known_hosts
+  desc "Set any defined SSH options"
+  task :set_options do
+    ssh_options[:paranoid] = ssh_options_paranoid rescue nil
+    ssh_options[:keys] = ssh_options_keys rescue nil
+    ssh_options[:forward_agent] = ssh_options_forward_agent rescue nil
+    ssh_options[:username] = ssh_options_username rescue user rescue nil
+    ssh_options[:port] = ssh_options_port rescue nil
+  end
 end
-
-ssh_options[:paranoid] = ssh_options_paranoid rescue nil
-ssh_options[:keys] = ssh_options_keys rescue nil
-ssh_options[:forward_agent] = ssh_options_forward_agent rescue nil
-ssh_options[:username] = ssh_options_username rescue user rescue nil
+before "chef:setup", "ssh:transfer_keys"
+before "ssh:transfer_keys", "ssh:set_options"
 
 if ChefDnaParser.parsed["upload"]
   uploads_for_roles = {}
@@ -177,7 +179,7 @@ namespace :chef do
         set "node_hash_for_#{channel[:host].gsub(/\./, "_")}", json_to_modify
         put json_to_modify.to_json, "/tmp/chef-cap-#{rails_env}-#{channel[:host]}.json", :mode => "0600"
       end
-    end
+      end
 
     chef.run_chef_solo
   end

data/spec/chef_cap_mock_cap.rb

@@ -92,6 +92,13 @@ def cap_role
   @servers ||= {}
 end
 
+def unset(key)
+  @variables.delete(key)
+  self.instance_eval(<<-EOS)
+    undef #{key}
+  EOS
+end
+
 def set(key, value)
   key.to_s.gsub!(/\.|-/, '_')
   self.instance_eval(<<-EOS)

data/spec/chef_cap_spec.rb

@@ -178,58 +178,97 @@ describe "chef_cap" do
                 "keys": "some_ssh_key_path"
               }
             }
+          },
+          "nossh": {
+            "ssh": {
+              "deploy_key_file": null
+            }
           }
         }
       }
       ERB
     end
 
-    it "parses out the deploy private key" do
-      chef_cap.cap_variable[:ssh_deploy_key_file].should_not be_nil
-      chef_cap.cap_variable[:ssh_deploy_key_file].should == File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssh_deploy_key')
-    end
+    describe "ssh:transfer_keys" do
+      context "setting variables" do
+        before do
+          chef_cap.stub!(:put).and_return(true)
+          chef_cap.cap_task["ssh:transfer_keys"].call
+        end
 
-    it "parses out the authorized public file" do
-      chef_cap.cap_variable[:ssh_authorized_pub_file].should_not be_nil
-      chef_cap.cap_variable[:ssh_authorized_pub_file].should == File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssh_public_key')
-    end
+        it "parses out the deploy private key" do
+          chef_cap.cap_variable[:ssh_deploy_key_file].should_not be_nil
+          chef_cap.cap_variable[:ssh_deploy_key_file].should == File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssh_deploy_key')
+        end
 
-    it "parses out the known hosts file" do
-      chef_cap.cap_variable[:ssh_known_hosts].should_not be_nil
-      chef_cap.cap_variable[:ssh_known_hosts].should == "knownhostscontent"
-    end
+        it "parses out the authorized public file" do
+          chef_cap.cap_variable[:ssh_authorized_pub_file].should_not be_nil
+          chef_cap.cap_variable[:ssh_authorized_pub_file].should == File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssh_public_key')
+        end
 
-    it "creates a task that uploads the keys to the server users .ssh directory" do
-      chef_cap.cap_namespace[:ssh].should be_true
-      chef_cap.cap_task["ssh:transfer_keys"].should_not be_nil
-      chef_cap.should_receive(:put).with("dsa imaprivatekey", ".ssh/id_dsa", :mode => "0600").and_return(true)
-      chef_cap.should_receive(:put).with("imapublickey", ".ssh/authorized_keys", :mode => "0600").and_return(true)
-      chef_cap.should_receive(:put).with("knownhostscontent", ".ssh/known_hosts", :mode => "0600").and_return(true)
+        it "parses out the known hosts file" do
+          chef_cap.cap_variable[:ssh_known_hosts].should_not be_nil
+          chef_cap.cap_variable[:ssh_known_hosts].should == "knownhostscontent"
+        end
+      end
 
-      chef_cap.cap_task["ssh:transfer_keys"].call
-    end
+      it "creates a task that uploads the keys to the server users .ssh directory" do
+        chef_cap.cap_namespace[:ssh].should be_true
+        chef_cap.cap_task["ssh:transfer_keys"].should_not be_nil
+        chef_cap.should_receive(:put).with("dsa imaprivatekey", ".ssh/id_dsa", :mode => "0600").and_return(true)
+        chef_cap.should_receive(:put).with("imapublickey", ".ssh/authorized_keys", :mode => "0600").and_return(true)
+        chef_cap.should_receive(:put).with("knownhostscontent", ".ssh/known_hosts", :mode => "0600").and_return(true)
 
-    it "adds a before chef:setup hook that that uploads the keys on every deploy" do
-      chef_cap.cap_before["chef:setup"].should_not be_nil
-      chef_cap.cap_before["chef:setup"].should include("ssh:transfer_keys")
-    end
+        chef_cap.cap_task["ssh:transfer_keys"].call
+      end
 
-    it "adds dependencies on remote files for the ssh files to be uploaded" do
-      chef_cap.cap_depends[".ssh/id_dsa"].should_not be_nil
-      chef_cap.cap_depends[".ssh/id_dsa"].should == { :remote => :file }
 
-      chef_cap.cap_depends[".ssh/authorized_keys"].should_not be_nil
-      chef_cap.cap_depends[".ssh/authorized_keys"].should == { :remote => :file }
+      it "adds a before chef:setup hook that that uploads the keys on every deploy" do
+        chef_cap.cap_before["chef:setup"].should_not be_nil
+        chef_cap.cap_before["chef:setup"].should include("ssh:transfer_keys")
+      end
+
+      it "adds dependencies on remote files for the ssh files to be uploaded" do
+        chef_cap.stub(:put).and_return(true)
+        chef_cap.cap_task["ssh:transfer_keys"].call
+        chef_cap.cap_depends[".ssh/id_dsa"].should_not be_nil
+        chef_cap.cap_depends[".ssh/id_dsa"].should == { :remote => :file }
 
-      chef_cap.cap_depends[".ssh/known_hosts"].should_not be_nil
-      chef_cap.cap_depends[".ssh/known_hosts"].should == { :remote => :file }
+        chef_cap.cap_depends[".ssh/authorized_keys"].should_not be_nil
+        chef_cap.cap_depends[".ssh/authorized_keys"].should == { :remote => :file }
+
+        chef_cap.cap_depends[".ssh/known_hosts"].should_not be_nil
+        chef_cap.cap_depends[".ssh/known_hosts"].should == { :remote => :file }
+      end
     end
 
-    describe "ssh_options" do
+    describe "ssh:set_options" do
       it "parses out keys" do
+        chef_cap.cap_task["ssh:set_options"].call
         chef_cap.cap_ssh_options[:keys].should_not be_nil
         chef_cap.cap_ssh_options[:keys].should == "some_ssh_key_path"
       end
+
+
+      it "adds a before ssh:transfer_keys hook to call ssh:set_options" do
+        chef_cap.cap_before["ssh:transfer_keys"].should_not be_nil
+        chef_cap.cap_before["ssh:transfer_keys"].should include("ssh:set_options")
+      end
+    end
+
+    context "when a value is null" do
+      it "will be not be uploaded" do
+        chef_cap.cap_variable[:ssh_deploy_key_file].should_not be_nil
+        chef_cap.cap_task[:nossh].call
+        chef_cap.cap_variable[:ssh_deploy_key_file].should be_nil
+
+        chef_cap.should_not_receive(:put).with("dsa imaprivatekey", ".ssh/id_dsa", :mode => "0600")
+        chef_cap.should_receive(:put).with("imapublickey", ".ssh/authorized_keys", :mode => "0600").and_return(true)
+        chef_cap.should_receive(:put).with("knownhostscontent", ".ssh/known_hosts", :mode => "0600").and_return(true)
+
+        chef_cap.cap_task["ssh:transfer_keys"].call
+        chef_cap.cap_variable[:ssh_deploy_key_file].should be_nil
+      end
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency