opsicle 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGZlNmRhOWYwZGQwYWNmYmUwZDc1NDUwMDkyNjBlNzYyZDk3NjU3OA==
+    YjgxNjkzMWVjMmJlYTllZWFjNjI0NTQzMjRlODFiNzYwMTM2Y2NlYQ==
   data.tar.gz: !binary |-
-    NTA5Zjk5Y2E1OWU3OTc2YjQ0MDZmY2ZjODJhYmM0ZmYzMDE1NjY2Yw==
+    YzdlMDkyYzMxMzI1ZDg0ZjYyNDllZTk4YmZjZDdkZDc1NGQ1YWE4Ng==
 SHA512:
   metadata.gz: !binary |-
-    OTNjYmVmYzg2NzIzMTE2ZTA2MmEwMGEwNGZjMGMwMmI4OTkxNzgyZWM0OWQy
-    YWZlNzRhYmJjYjFhZWM0NjU0NDgxODk1ZmViM2E1YzEzYWRkNWQxYzU5MTlk
-    ZTg0M2U4YTM3NWUzNzFhNWIwNmI3NmVjMjQzZWNjMjU2MzhjMzM=
+    NjUwYzNhMzVmMjMwY2I3NGEyY2VhYzZiMTRkYjc4ZTNhYjU5Nzg5N2I5ZTgx
+    ZDAyODY1Yjc2ODQ2ZmJkNWYwZGI0Y2ZjMDAwZGJiYWRmMDJiYTg1OTU5YjEy
+    MjhmNzcxMjVjZTU1OWZmZDFhZWFhYWJiNGEzNTljNjQzYzA4MTY=
   data.tar.gz: !binary |-
-    YjAwMzVjZThkNDFiZTNhZGYxMTgwM2FiNDRjMjE0NTZhZGEyYmM0MjZmMDZi
-    YmNjOTc3NzQzNGZlNzU5ZDJkMjk3NjI3ZjUzOTNlNzdkOGU2ZDc5ZDUxMmNj
-    MzA2YmJlOTRkZDFjMTAyMmJhNGFiMTY3NzU0NGNjMDdkZTc5ZDc=
+    YTNiZTgzMTgxMDY2N2Q4ZjM3ZTMzMmY3NjEzMjExNTU3YTUyODBhNjA4OGZi
+    NzIxMjZhZGFlMjIyZDExZmYzZmViNzQxY2RkZDk2Y2M4ODkxMDQ2MzUxZDVm
+    YjhmOTgwODViZGVmZWQ3NTFkOWI5NzZhZDc2ZGFlZjg1MmU1N2Y=

data/bin/opsicle

@@ -57,6 +57,8 @@ end
 desc "SSH access to instances in the given environment stack"
 arg_name '<environment>'
 command :ssh do |c|
+  c.flag [:o, :"ssh-opts"], :desc => "SSH command line options.", :must_match => '/"[^"]+"/'
+  c.flag [:c, :"ssh-cmd"], :desc => "Command to pass to SSH", :must_match => '/"[^"]+"/'
   c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
     Opsicle::SSH.new(args.first).execute global_options.merge(options)
@@ -118,11 +120,12 @@ end
 desc "Update the Stack Custom Chef Cookbooks"
 arg_name '<environment>'
 command 'chef-update' do |c|
+  c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
   c.flag [:path],
     :desc => "Path to the directory of chef cookbooks to be uploaded to s3",
     :default_value => "cookbooks"
   c.flag [:"bucket-name"],
-    :desc => "The S3 bucket name to upload the cookbooks to"
+    :desc => "The S3 bucket name to upload the cookbooks to (required for opsicle to perform an upload to S3)"
   c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
 

data/lib/opsicle/commands/chef_update.rb

@@ -18,9 +18,11 @@ module Opsicle
     end
 
     def execute(options={ monitor: true })
-      tar_cookbooks(options[:path])
-      s3_upload(options[:"bucket-name"])
-      cleanup_tar
+      if options[:"bucket-name"]
+        tar_cookbooks(options[:path])
+        s3_upload(options[:"bucket-name"])
+        cleanup_tar
+      end
       response = update_custom_cookbooks
       launch_stack_monitor(response, options)
     end

data/lib/opsicle/commands/ssh.rb

@@ -18,8 +18,11 @@ module Opsicle
       end
 
       instance_ip = instances[choice-1][:elastic_ip] || instances[choice-1][:public_ip]
+      ssh_command = " \"#{options[:"ssh-cmd"].gsub(/'/){ %q(\') }}\"" if options[:"ssh-cmd"] #escape single quotes
+      ssh_options = "#{options[:"ssh-opts"]} " if options[:"ssh-opts"]
+
+      command = "ssh #{ssh_options}#{ssh_username}@#{instance_ip}#{ssh_command}"
 
-      command = "ssh #{ssh_username}@#{instance_ip}"
       Output.say_verbose "Executing shell command: #{command}"
       system(command)
     end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/opsicle/commands/chef_update_spec.rb

@@ -26,35 +26,37 @@ module Opsicle
     end
 
     context "#execute" do
-
-      it "tars up the cookooks" do
-        allow(subject).to receive(:s3_upload)
-        allow(subject).to receive(:cleanup_tar)
-        allow(subject).to receive(:update_custom_cookbooks)
-        allow(subject).to receive(:launch_stack_monitor)
-        expect(subject).to receive(:tar_cookbooks)
-
-        subject.execute
-      end
-
-      it "uploads the cookbooks to s3" do
-        allow(subject).to receive(:tar_cookbooks)
-        allow(subject).to receive(:cleanup_tar)
-        allow(subject).to receive(:update_custom_cookbooks)
-        allow(subject).to receive(:launch_stack_monitor)
-        expect(subject).to receive(:s3_upload)
-
-        subject.execute
-      end
-
-      it "cleans up the tarball created to upload to s3" do
-        allow(subject).to receive(:tar_cookbooks)
-        allow(subject).to receive(:s3_upload)
-        allow(subject).to receive(:update_custom_cookbooks)
-        allow(subject).to receive(:launch_stack_monitor)
-        expect(subject).to receive(:cleanup_tar)
-
-        subject.execute
+      context "s3 upload" do
+
+        it "tars up the cookooks" do
+          allow(subject).to receive(:s3_upload)
+          allow(subject).to receive(:cleanup_tar)
+          allow(subject).to receive(:update_custom_cookbooks)
+          allow(subject).to receive(:launch_stack_monitor)
+          expect(subject).to receive(:tar_cookbooks)
+
+          subject.execute(:"bucket-name" => bucket_name)
+        end
+
+        it "uploads the cookbooks to s3" do
+          allow(subject).to receive(:tar_cookbooks)
+          allow(subject).to receive(:cleanup_tar)
+          allow(subject).to receive(:update_custom_cookbooks)
+          allow(subject).to receive(:launch_stack_monitor)
+          expect(subject).to receive(:s3_upload)
+
+          subject.execute(:"bucket-name" => bucket_name)
+        end
+
+        it "cleans up the tarball created to upload to s3" do
+          allow(subject).to receive(:tar_cookbooks)
+          allow(subject).to receive(:s3_upload)
+          allow(subject).to receive(:update_custom_cookbooks)
+          allow(subject).to receive(:launch_stack_monitor)
+          expect(subject).to receive(:cleanup_tar)
+
+          subject.execute(:"bucket-name" => bucket_name)
+        end
       end
 
       it "creates a new update_custom_cookbooks and opens stack monitor" do

data/spec/opsicle/commands/ssh_spec.rb

@@ -57,6 +57,17 @@ module Opsicle
         expect(subject).not_to receive(:ask)
         subject.execute
       end
+
+      it "executes ssh with ssh options and command" do
+        allow(subject).to receive(:instances) {[
+                                    { hostname: "host1", elastic_ip: "123.123.123.123" },
+                                    { hostname: "host2", elastic_ip: "789.789.789.789" }
+                                  ]}
+
+        expect(subject).to receive(:system).with("ssh -p 234 mrderpyman2014@789.789.789.789 \"cd /srv/www\"")
+        subject.execute({ :"ssh-opts" => '-p 234', :"ssh-cmd" => 'cd /srv/www'})
+      end
+
     end
 
     context "#client" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk