simple_deploy 0.6.2 → 0.6.3

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p194@simple_deploy --create
+rvm use ruby-1.9.3-p327@simple_deploy --create

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.6.3:
+
+* Instances return different message when no instances vs non existent stack
+* Updating rvm to ruby 1.9.3-p327
+* Updated to stackster version 0.4.0
+
 ## v0.6.2
 
 * Corrected the deploy command so it exits if a stack update fails

data/README.md

@@ -27,36 +27,7 @@ environments:
     region: us-west-1
 ```
 
-Notifications
+Documentation
 -------------
 
-Currently Simple Deploy only supports Campfire for notifications.  To enable them, add your token, which can be obtained on the 'My Info' screen of Campfire in the notifications yaml above.  If you don't want notificaitons, omit this section.
-
-To enable notifications on deployment to a Campfire room. Append the below to the **~/.simple_deploy.yml**.
-
-```
-notifications:
-  campfire:
-    token: XXX
-```
-
-Commands
---------
-
-For a list of commands, run **simple_deploy -h**.  To get more information about each subcommand, append a -h after the subcomand.  For example: **simple_deploy deploy -h**.
-
-Deploying
----------
-
-By default simple deploy will use your user name and id_rsa key for deployments.  To override either these, set the **SIMPLE_DEPLOY_SSH_USER** & **SIMPLE_DEPLOY_SSH_KEY** respectively.
-
-```
-export SIMPLE_DEPLOY_SSH_USER=user
-export SIMPLE_DEPLOY_SSH_KEY=path_to_ssh_key
-```
-
-An alternate config file can be supplied by setting the **SIMPLE_DEPLOY_CONFIG_FILE** variable.
-
-```
-export SIMPLE_DEPLOY_CONFIG_FILE=/secret/my-config.yml
-```
+For more information, please view the [Simple Deploy Wiki](https://github.com/intuit/simple_deploy/wiki).

data/lib/simple_deploy/cli/instances.rb

@@ -32,9 +32,12 @@ EOS
                           :logger      => logger,
                           :internal    => opts[:internal]
 
+        exit 1 unless stack.exists?
+
         instances = stack.instances
+
         if instances.nil? || instances.empty?
-          puts "stack '#{opts[:name]}' does not exist"
+          logger.info "Stack '#{opts[:name]}' does not have any instances."
         else
           jj stack.instances
         end

data/lib/simple_deploy/stack.rb

@@ -94,6 +94,13 @@ module SimpleDeploy
       stack.status
     end
 
+    def exists?
+      stack.status
+      true
+    rescue Stackster::Exceptions::UnknownStack
+      false
+    end
+
     def attributes
       stack.attributes 
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/simple_deploy.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.11.0"
 
   s.add_runtime_dependency "capistrano", "= 2.13.5"
-  s.add_runtime_dependency "stackster", '= 0.3.2'
+  s.add_runtime_dependency "stackster", '= 0.4.0'
   s.add_runtime_dependency "tinder", "= 1.9.1"
   s.add_runtime_dependency "trollop", "= 2.0"
 end

data/spec/cli_spec.rb

@@ -5,9 +5,9 @@ describe SimpleDeploy do
 
   it "should call the given sub command" do
     status_mock = mock 'status mock'
-    ARGV = ['status', '-h']
+    ARGV.stub :shift => 'status'
     status_mock.should_receive(:show)
-    SimpleDeploy::CLI::Status.should_receive(:new).and_return status_mock
+    SimpleDeploy::CLI::Status.stub :new => status_mock
     SimpleDeploy::CLI.start
   end
 

data/spec/stack_spec.rb

@@ -271,4 +271,32 @@ describe SimpleDeploy do
       @stack.execute(:arg => 'val').should be_false
     end
   end
+
+  describe "exists?" do
+    before do
+      @stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                       :name        => 'test-stack',
+                                       :logger      => 'my-logger',
+                                       :config      => @config_stub,
+                                       :internal    => false
+      @stack_mock.stub(:attributes).and_return({})
+      Stackster::Stack.should_receive(:new).
+                       with(:environment => 'test-env',
+                            :name        => 'test-stack',
+                            :config      => @environment_config_mock,
+                            :logger      => @logger_stub).
+                       and_return @stack_mock
+    end
+
+    it "should return true if stack exists" do
+      @stack_mock.stub :status => 'CREATE_COMPLTE'
+      @stack.exists?.should be_true
+    end
+
+    it "should return false if the stack does not exist" do
+      @stack_mock.should_receive(:status).
+                  and_raise Stackster::Exceptions::UnknownStack.new 'Stack:test-stack does not exist'
+      @stack.exists?.should be_false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70276931560440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70276931560440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70276931559900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,76 +32,51 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70276931559900
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70276931559100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.13.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.13.5
+  version_requirements: *70276931559100
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70276931558560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.2
+  version_requirements: *70276931558560
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70276931558020 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.9.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.1
+  version_requirements: *70276931558020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70276931557360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *70276931557360
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -193,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1066179767380513857
+      hash: 1556323809252766114
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1066179767380513857
+      hash: 1556323809252766114
 requirements: []
 rubyforge_project: simple_deploy
-rubygems_version: 1.8.24
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: I help with deployments