simple_deploy 0.4.7 → 0.4.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+## v0.4.8:
+
+* Added as_command_args option to attributes cli
+
 ## v0.4.7:
 
 * Added specs

data/lib/simple_deploy/cli/attributes.rb

@@ -2,9 +2,10 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Attributes
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -14,25 +15,49 @@ simple_deploy attributes -n STACK_NAME -e ENVIRONMENT
 
 EOS
           opt :help, "Display Help"
+          opt :as_command_args,
+              "Displays the attributes in a format suitable for using on the command line"
           opt :environment, "Set the target environment", :type => :string
           opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
                                                                   :default => 'info'
           opt :name, "Stack name to manage", :type => :string
         end
 
-        CLI::Shared.valid_options? :provided => opts,
+        CLI::Shared.valid_options? :provided => @opts,
                                    :required => [:environment, :name]
 
-        config = Config.new.environment opts[:environment]
+        @opts[:as_command_args] ? command_args_output : default_output
+      end
+
+      private
+      def attribute_data
+        Hash[stack.attributes.sort]
+      end
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+      def command_args_output
+        puts attribute_data.map { |k, v| "-a #{k}=#{v}" }.join(' ')
+      end
+
+      def config
+        @config ||= Config.new.environment @opts[:environment]
+      end
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
-                          :config      => config,
-                          :logger      => logger
-        Hash[stack.attributes.sort].each_pair { |k, v| puts "#{k}=#{v}" }
+      def default_output
+        attribute_data.each_pair { |k, v| puts "#{k}=#{v}" }
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def stack
+        @stack = Stack.new :environment => @opts[:environment],
+                           :name         => @opts[:name],
+                           :config       => config,
+                           :logger       => logger
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/script/ci_setup

@@ -2,13 +2,13 @@
 
 # Source RVM profile and set ruby / gemset
 . /etc/profile
-rvm use "1.9.3-p125@simple_deploy" --create
+
+# Exit with error if any command returns non zero
+set -e
 
 # Bundle gems
+rvm use "1.9.3-p125@simple_deploy" --create
 bundle
 
-# Create blank deployment config
-touch $HOME/.simple_deploy.yml
-
 # Run spec tests
 rspec spec

data/spec/cli/attributes_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe SimpleDeploy::CLI::Attributes do
+
+  describe 'show' do
+    before do
+      @config  = mock 'config'
+      @logger  = stub 'logger'
+      @options = { :environment => 'my_env',
+                   :log_level   => 'debug',
+                   :name        => 'my_stack' }
+      @stack   = stub :attributes => { 'foo' => 'bar', 'baz' => 'blah' }
+
+      SimpleDeploy::Config.stub(:new).and_return(@config)
+      @config.should_receive(:environment).with('my_env').and_return(@config)
+      SimpleDeploy::SimpleDeployLogger.should_receive(:new).
+                                       with(:log_level => 'debug').
+                                       and_return(@logger)
+      SimpleDeploy::Stack.should_receive(:new).
+                          with(:config      => @config,
+                               :environment => 'my_env',
+                               :logger      => @logger,
+                               :name        => 'my_stack').
+                          and_return(@stack)
+    end
+
+    it 'should output the attributes' do
+      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                with(:provided => @options,
+                                     :required => [:environment, :name])
+      Trollop.stub(:options).and_return(@options)
+      subject.should_receive(:puts).with("foo=bar")
+      subject.should_receive(:puts).with("baz=blah")
+      subject.show
+    end
+
+    context 'with --as-command-args' do
+      before do
+        @options[:as_command_args] = true
+        Trollop.stub(:options).and_return(@options)
+        SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
+                                  with(:provided => @options,
+                                       :required => [:environment, :name])
+      end
+
+      it 'should output the attributes as command arguments' do
+        subject.should_receive(:puts).with("-a baz=blah -a foo=bar")
+        subject.show
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353611776560 !ruby/object:Gem::Requirement
+  requirement: &70332846279420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353611776560
+  version_requirements: *70332846279420
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70353611775520 !ruby/object:Gem::Requirement
+  requirement: &70332846278440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353611775520
+  version_requirements: *70332846278440
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70353611735820 !ruby/object:Gem::Requirement
+  requirement: &70332846256720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70353611735820
+  version_requirements: *70332846256720
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70353611734300 !ruby/object:Gem::Requirement
+  requirement: &70332846255020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353611734300
+  version_requirements: *70332846255020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70353611732160 !ruby/object:Gem::Requirement
+  requirement: &70332846253680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353611732160
+  version_requirements: *70332846253680
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -112,6 +112,7 @@ files:
 - script/ci_setup
 - simple_deploy.gemspec
 - spec/artifact_spec.rb
+- spec/cli/attributes_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/logger_spec.rb
@@ -136,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4377497411000345519
+      hash: 2975550354035595728
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4377497411000345519
+      hash: 2975550354035595728
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16
@@ -154,6 +155,7 @@ specification_version: 3
 summary: I help with deployments
 test_files:
 - spec/artifact_spec.rb
+- spec/cli/attributes_spec.rb
 - spec/cli_spec.rb
 - spec/config_spec.rb
 - spec/logger_spec.rb