simple_deploy 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.5.1:
+
+* Corrected the use of the domain attribute in URLs during deployments
+* Corrected the use of the force option during deployments
+* Added help text on SSH usage to the deploy command
+* Corrected the acceptable options for the protect command
+
 ## v0.5.0:
 
 * Updated the update command so it accepts a force option

data/README.md

@@ -12,16 +12,6 @@ gem install simple_deploy
 Create a file **~/.simple_deploy.yml** and include within it:
 
 ```
-artifacts: 
-  chef_repo:
-    bucket_prefix: bucket1
-    domain: app1-chef_repo
-  app:
-    bucket_prefix: bucket2
-    domain: app1
-  cookbooks:
-    bucket_prefix: bucket2
-
 environments:
   preprod_shared_us_west_1:
     access_key: XXX
@@ -41,7 +31,7 @@ Currently Simple Deploy only supports Campfire for notifications.  To enable the
 Advaned Configurations
 ----------------------
 
-The configuration file supports additional optional deployment parameters.  Artifacts can have an **endpoint** specified to be passed in (by default they pass in the s3 url).
+The configuration file supports additional optional deployment parameters. 
 
 Deploy can have a ssh **user** and **key** set.  These will be used to connect to both the gateway and tunnel through to instances.
 

data/lib/simple_deploy/cli.rb

@@ -57,13 +57,13 @@ module SimpleDeploy
       when 'update'
         CLI::Update.new.update
       when '-h'
-        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update] [options]"
+        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|protect|resources|ssh|status|update] [options]"
         puts "Append -h for help on specific subcommand."
       when '-v'
         puts SimpleDeploy::VERSION
       else
         puts "Unknown command: '#{cmd}'."
-        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update] [options]"
+        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|protect|resources|ssh|status|update] [options]"
         puts "Append -h for help on specific subcommand."
         exit 1
       end

data/lib/simple_deploy/cli/deploy.rb

@@ -12,6 +12,21 @@ Execute deployment on given stack(s).
 
 simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT
 
+Using SSH:
+
+Simple deploy defaults your user and key for SSH to your username and your id_rsa key.
+
+If you need to override these because you want to use a different username or you have a different key file,
+you can set simple deploy specific environment variables to do the override.
+
+Example 1: Overriding when the command is run.
+SIMPLE_DEPLOY_SSH_USER=fred SIMPLE_DEPLOY_SSH_KEY=$HOME/.ssh/id_dsa simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT
+
+Example 2: Overriding them in your shell environment (bash shell used in the example).
+export SIMPLE_DEPLOY_SSH_USER=fred
+export SIMPLE_DEPLOY_SSH_KEY=$HOME/.ssh/id_dsa
+simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT
+
 EOS
           opt :help, "Display Help"
           opt :attributes, "= seperated attribute and it's value", :type  => :string,

data/lib/simple_deploy/cli/protect.rb

@@ -11,11 +11,12 @@ module SimpleDeploy
 
 Protect a stack.
 
-simple_deploy protect -n STACK_NAME -e ENVIRONMENT -a PROTECTION=ON_OFF
+simple_deploy protect -n STACK_NAME -e ENVIRONMENT -p on_off
 
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
+          opt :protection, "Enable/Disable protection using on/off", :type  => :string
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name of stack to protect", :type => :string
@@ -28,14 +29,11 @@ EOS
 
         logger = SimpleDeployLogger.new :log_level => opts[:log_level]
 
-        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
-                                                  :logger     => logger
-
         stack = Stack.new :environment => opts[:environment],
                           :name        => opts[:name],
                           :config      => config,
                           :logger      => logger
-        stack.update :attributes => attributes
+        stack.update :attributes => [{ 'protection' => opts[:protection] }]
       end
     end
   end

data/lib/simple_deploy/stack/deployment.rb

@@ -35,7 +35,11 @@ module SimpleDeploy
         set_deploy_command
       end
 
-      def execute(force=false)
+      def execute(force = false)
+        if !clear_for_deployment? && force
+          clear_deployment_lock true
+        end
+
         if clear_for_deployment?
           status.set_deployment_in_progress
           @logger.info 'Starting deployment.'
@@ -53,8 +57,8 @@ module SimpleDeploy
         status.clear_for_deployment?
       end
 
-      def clear_deployment_lock(force=false)
-        status.clear_deployment_lock(force)
+      def clear_deployment_lock(force = false)
+        status.clear_deployment_lock force
       end
 
       def ssh

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -27,20 +27,20 @@ module SimpleDeploy
       @config.artifacts
     end
     
-    def cloud_formation_url attribute
+    def cloud_formation_url(attribute)
       name = attribute.keys.first
       id = attribute[name]
-      a = @config.artifacts.select { |a| a['name'] == name }.first
 
       bucket_prefix = @main_attributes["#{name}_bucket_prefix"]
-      url_parameter = @config.artifact_cloud_formation_url name
-
+      domain = @main_attributes["#{name}_domain"]
       artifact = Artifact.new :name          => name,
                               :id            => id,
                               :region        => @region,
                               :config        => @config,
+                              :domain        => domain,
                               :bucket_prefix => bucket_prefix
 
+      url_parameter = @config.artifact_cloud_formation_url name
       { url_parameter => artifact.endpoints['s3'] }
     end
 

data/lib/simple_deploy/version.rb

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

data/spec/cli/protect_spec.rb

@@ -20,7 +20,7 @@ describe SimpleDeploy::CLI::Protect do
       options = { :environment => 'my_env',
                   :log_level   => 'debug',
                   :name        => 'my_stack',
-                  :attributes  => ['protection=on'] }
+                  :protection  => 'on' }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
                                 with(:provided => options,
@@ -44,7 +44,7 @@ describe SimpleDeploy::CLI::Protect do
       options = { :environment => 'my_env',
                   :log_level   => 'debug',
                   :name        => 'my_stack',
-                  :attributes  => ['protection=off'] }
+                  :protection  => 'off' }
 
       SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
                                 with(:provided => options,

data/spec/stack/deployment_spec.rb

@@ -91,10 +91,11 @@ describe SimpleDeploy do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:clear_for_deployment?).and_return true
+      status_mock.stub(:clear_for_deployment?).and_return true
       status_mock.should_receive(:set_deployment_in_progress)
       @deployment_mock.should_receive(:simpledeploy)
       status_mock.should_receive(:unset_deployment_in_progress)
+
       @stack.execute.should == true
     end
 
@@ -102,10 +103,12 @@ describe SimpleDeploy do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:clear_for_deployment?).and_return true
+      status_mock.should_receive(:clear_for_deployment?).and_return false, true
+      status_mock.should_receive(:clear_deployment_lock).with(true)
       status_mock.should_receive(:set_deployment_in_progress)
       @deployment_mock.should_receive(:simpledeploy)
       status_mock.should_receive(:unset_deployment_in_progress)
+
       @stack.execute(true).should == true
     end
 
@@ -113,8 +116,9 @@ describe SimpleDeploy do
       status_mock = mock 'status mock'
       SimpleDeploy::Stack::Deployment::Status.should_receive(:new).
                                               and_return status_mock
-      status_mock.should_receive(:clear_for_deployment?).and_return false
+      status_mock.stub(:clear_for_deployment?).and_return false
       @logger_stub.should_receive(:error)
+
       @stack.execute.should == false
     end
   end

data/spec/stack/stack_attribute_formater_spec.rb

@@ -2,37 +2,22 @@ require 'spec_helper'
 
 describe SimpleDeploy do
   before do
-    @config_mock = mock 'config mock'
-    @logger_mock = mock 'logger mock'
-    @config_mock.should_receive(:region).with('preprod').
-                 and_return 'us-west-1'
-    @config_mock.should_receive(:logger).and_return @logger_mock
+    @logger_mock = mock 'logger mock', :info => 'true'
+    @config_mock = mock 'config mock', :logger => @logger_mock, :region => 'us-west-1'
+    @config_mock.stub(:artifact_cloud_formation_url).and_return('CookBooksURL')
+    @config_mock.stub(:artifacts).and_return(['chef_repo', 'cookbooks', 'app'])
 
     options = { :config      => @config_mock,
                 :environment => 'preprod',
-                :main_attributes => { 'chef_repo_bucket_prefix' => 'test-prefix' } }
+                :main_attributes => {
+                  'chef_repo_bucket_prefix' => 'test-prefix',
+                  'chef_repo_domain' => 'test-domain' }
+              }
     @formater = SimpleDeploy::StackAttributeFormater.new options
   end
 
-  it "should return updated attributes including cloud formation url" do
-    artifact_mock = mock 'artifact'
-    SimpleDeploy::Artifact.should_receive(:new).exactly(2).times.
-                           with(:name => 'chef_repo',
-                                :id   => 'test123',
-                                :region => 'us-west-1',
-                                :config => @config_mock,
-                                :bucket_prefix => 'test-prefix').
-                           and_return artifact_mock
-    @config_mock.should_receive(:artifact_cloud_formation_url).with('chef_repo').
-                 exactly(2).times.
-                 and_return('CookBooksURL')
-    @config_mock.should_receive(:artifacts).exactly(3).times.
-                 and_return ['chef_repo', 'cookbooks', 'app']
-    @logger_mock.should_receive(:info)
-    artifact_mock.should_receive(:endpoints).exactly(2).times.
-                                             and_return 's3' => 's3_url'
-    @formater.updated_attributes([ { 'chef_repo' => 'test123' } ]).
-              should == [ { "chef_repo" => "test123" }, 
-                          { "CookBooksURL" =>"s3_url" } ]
+  it 'should return updated attributes including the cloud formation url' do
+    updates = @formater.updated_attributes([ { 'chef_repo' => 'test123' } ])
+    updates.should == [{ 'chef_repo' => 'test123' }, { 'CookBooksURL' => 's3://test-prefix-us-west-1/test-domain/test123.tar.gz' }]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152015560 !ruby/object:Gem::Requirement
+  requirement: &2155888560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152015560
+  version_requirements: *2155888560
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152014980 !ruby/object:Gem::Requirement
+  requirement: &2155887980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152014980
+  version_requirements: *2155887980
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &2152014180 !ruby/object:Gem::Requirement
+  requirement: &2155887300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *2152014180
+  version_requirements: *2155887300
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &2152176220 !ruby/object:Gem::Requirement
+  requirement: &2155886560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152176220
+  version_requirements: *2155886560
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2152175540 !ruby/object:Gem::Requirement
+  requirement: &2156048720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152175540
+  version_requirements: *2156048720
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net