cf-deploy 0.1.2 → 0.1.4

data/README.md

@@ -139,7 +139,7 @@ the [CloudFoundry CLI][cli] repo on github.
 You then need to install this gem in your project's `Gemfile`:
 
 ``` ruby
-gem 'cf-deploy', '0.1.1'
+gem 'cf-deploy', '0.1.4'
 ```
 
 ### Defining CloudFoundry details in your Rakefile
@@ -260,6 +260,7 @@ bundle exec rake cf:deploy:production:stop_idle
 Developed and maintained by [Made Tech][made]. Key contributions:
 
  * [Luke Morton](https://github.com/DrPheltRight)
+ * [Chris Blackburn](https://github.com/chrisblackburn)
 
 ## License
 

data/lib/cf/deploy/blue_green.rb

@@ -39,8 +39,9 @@ module CF
 
       def define_stop_idle_task
         Rake::Task.define_task("#{env[:task_name]}:stop_idle" => 'cf:login') do
-          idle_app_name = app_name_from_color(idle_color(env))
-          cf.stop(idle_app_name)
+          env.app_names_for_colour(idle_color(env)).each do |app_name|
+            cf.stop(app_name)
+          end
         end
       end
 

data/lib/cf/deploy/commands.rb

@@ -6,7 +6,7 @@ module CF
 
         login_cmd << Config::VALID_CF_KEYS
           .reject { |key| config[key].nil? }
-          .map { |key| "-#{key.to_s[0]} #{config[key]}" }
+          .map { |key| "-#{key.to_s[0]} '#{config[key]}'" }
 
         Kernel.system(login_cmd.flatten.join(' '))
       end

data/lib/cf/deploy/env_config.rb

@@ -57,6 +57,13 @@ module CF
         end
       end
 
+      def app_names_for_colour(colour)
+        self[:manifests].flat_map do |manifest|
+          names = app_names_for_manifest(File.expand_path(manifest.to_s))
+          names if names.first.include?(colour)
+        end.compact
+      end
+
       # Environment config setter methods
       #
       def manifest(manifest)

data/lib/cf/deploy/version.rb

@@ -1,5 +1,5 @@
 module CF
   class Deploy
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end

data/spec/login_task_spec.rb

@@ -19,7 +19,7 @@ describe CF::Deploy do
         api 'api.run.pivotal.io'
       end
 
-      expect(Kernel).to receive(:system).with('cf login -a api.run.pivotal.io')
+      expect(Kernel).to receive(:system).with("cf login -a 'api.run.pivotal.io'")
       Rake::Task['cf:login'].invoke
     end
 
@@ -32,7 +32,7 @@ describe CF::Deploy do
         space 'space'
       end
 
-      expect(Kernel).to receive(:system).with('cf login -a api -u test -p pass -o org -s space')
+      expect(Kernel).to receive(:system).with("cf login -a 'api' -u 'test' -p 'pass' -o 'org' -s 'space'")
       Rake::Task['cf:login'].invoke
     end
 
@@ -45,7 +45,7 @@ describe CF::Deploy do
         expect(ENV).to receive(:[]).with(k).and_return(v).at_least(:once)
       end
 
-      expect(Kernel).to receive(:system).with('cf login -a api -u test -p pass -o org -s space')
+      expect(Kernel).to receive(:system).with("cf login -a 'api' -u 'test' -p 'pass' -o 'org' -s 'space'")
       described_class.rake_tasks!
       Rake::Task['cf:login'].invoke
     end
@@ -59,7 +59,7 @@ describe CF::Deploy do
         expect(ENV).to receive(:[]).with(k).and_return(v).at_least(:once)
       end
 
-      expect(Kernel).to receive(:system).with('cf login -a api -u test -p pass -o org')
+      expect(Kernel).to receive(:system).with("cf login -a 'api' -u 'test' -p 'pass' -o 'org'")
 
       described_class.rake_tasks! do
         api 'api'

data/spec/stop_idle_task_spec.rb

@@ -21,6 +21,7 @@ describe CF::Deploy do
         rake_tasks!
         expect(Kernel).to receive(:system).with('cf login').ordered
         expect(Kernel).to receive(:system).with('cf stop production-blue-app').ordered
+        expect(Kernel).to receive(:system).with('cf stop production-blue-background').ordered
         Rake::Task['cf:deploy:production:stop_idle'].invoke
       end
     end
@@ -29,8 +30,9 @@ describe CF::Deploy do
       Dir.chdir('spec/') do
         rake_tasks!
         expect(Kernel).to receive(:system).with('cf login').ordered
-        expect(IO).to receive(:popen).with("cf routes | grep 'yourwebsite.com'") { double(:read => 'production-blue-app', :close => nil) }
+        expect(IO).to receive(:popen).with("cf routes | grep 'yourwebsite.com'") { double(read: 'production-blue-app', close: nil) }
         expect(Kernel).to receive(:system).with('cf stop production-green-app').ordered
+        expect(Kernel).to receive(:system).with('cf stop production-green-background').ordered
         Rake::Task['cf:deploy:production:stop_idle'].invoke
       end
     end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cf-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
 - Luke Morton
+- Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +95,7 @@ dependencies:
 description: 
 email:
 - luke@madetech.co.uk
+- chris@madetech.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -127,18 +129,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2725312878394451314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2725312878394451314
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23