cf-deploy 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9d3ab27f6234099b40263d3084f85a9977a18d
-  data.tar.gz: a362835aea9906c7d5e457b2cf160e787a0ca9b8
+  metadata.gz: cbe6ee713d98618faadead85006d67ac7c1d4605
+  data.tar.gz: 99cf899f683d77a983708101a80532a597e698a4
 SHA512:
-  metadata.gz: f700d71e5a1871c84d59fc792b754186921e8f11d8c91a5ad5dc310638f2957e88a9c8a14b164ee352fe26f850f72314813da43692058d1c49a2c5598354d4dd
-  data.tar.gz: 94a051241f13054e23568946eb33af97da8cff885326bb0e0faf62e41a7e1a56f6d321ffd9341142dff3a240529f64cf910e5cea343b35078cbac209dbb4dfaa
+  metadata.gz: 89cadfc6b4d7a97b90e58d3764f0c52d13abe3a178a309b51903016a64c098ba8644fda6f943fe774a43b50c0c9d306ad9e6372d60e7a866ebbb888f48ce2e7a
+  data.tar.gz: 023cd1fd9b7fdd51f8842cc06390bfd95672b61642bc6a8894ecf3558f732f4e319f7bb70bffdd2e02c0563bc90e48a2c71a8efa9a0e6ac1f76a7e06cf2a3dd4

data/lib/cf/deploy.rb

@@ -32,9 +32,8 @@ module CF
     def define_login_task
       return Rake::Task['cf:login'] if Rake::Task.task_defined?('cf:login')
 
-      Rake::Task.define_task('cf:login') do
-        cf.login(config)
-      end
+      task = Rake::Task.define_task('cf:login') { cf.login(config) }
+      task.add_description('Login to cf command line')
     end
 
     def define_deploy_tasks(env)
@@ -46,7 +45,7 @@ module CF
     end
 
     def define_deploy_task(env, deployment)
-      Rake::Task.define_task(deployment[:task_name] => env[:deps]) do
+      task = Rake::Task.define_task(deployment[:task_name] => env[:deps]) do
         unless cf.push(deployment[:manifest])
           raise "Failed to deploy #{deployment}"
         end
@@ -57,12 +56,14 @@ module CF
           end
         end
 
-        unless env[:runtime_memory].nil?
-          deployment[:app_names].each do |app_name|
-            cf.scale_memory(app_name, env[:runtime_memory])
+        deployment[:apps].each do |app|
+          unless env[:runtime_memory].nil? and app[:runtime_memory].nil?
+            cf.scale_memory(app[:name], env[:runtime_memory] || app[:runtime_memory])
           end
         end
       end
+
+      task.add_description("Deploy #{deployment[:app_names].join(', ')}")
     end
   end
 end

data/lib/cf/deploy/blue_green.rb

@@ -19,14 +19,16 @@ module CF
       private
 
       def define_deployment_task
-        Rake::Task.define_task(env[:task_name] => env[:deps]) do
+        task = Rake::Task.define_task(env[:task_name] => env[:deps]) do
           task_name = EnvConfig.task_name("#{env[:name]}_#{idle_color(env)}")
           Rake::Task[task_name].invoke
         end
+
+        task.add_description("Deploy #{env}")
       end
 
       def define_flip_task
-        Rake::Task.define_task("#{env[:task_name]}:flip" => 'cf:login') do
+        task = Rake::Task.define_task("#{env[:task_name]}:flip" => 'cf:login') do
           live_app_name = app_name_from_color(live_color(env))
           idle_app_name = app_name_from_color(idle_color(env))
 
@@ -35,14 +37,18 @@ module CF
             cf.unmap_route(route, live_app_name)
           end
         end
+
+        task.add_description('Flip routes to point at currently idle app')
       end
 
       def define_stop_idle_task
-        Rake::Task.define_task("#{env[:task_name]}:stop_idle" => 'cf:login') do
+        task = Rake::Task.define_task("#{env[:task_name]}:stop_idle" => 'cf:login') do
           env.app_names_for_colour(idle_color(env)).each do |app_name|
             cf.stop(app_name)
           end
         end
+
+        task.add_description('Stop currently idle app')
       end
 
       def app_name_from_color(colour)

data/lib/cf/deploy/env_config.rb

@@ -30,7 +30,8 @@ module CF
       def deployment_for_manifest(manifest)
         { task_name: deployment_task_name(manifest),
           manifest: manifest,
-          app_names: app_names_for_manifest(manifest) }
+          app_names: app_names_for_manifest(manifest),
+          apps: apps_for_manifest(manifest) }
       end
 
       def deployment_task_name(manifest)
@@ -41,14 +42,20 @@ module CF
         end
       end
 
-      def app_names_for_manifest(manifest)
+      def apps_for_manifest(manifest)
         config = YAML.load_file(manifest)
 
         if config['applications'].nil?
           raise "No applications defined in YAML manifest #{manifest}"
         end
 
-        config['applications'].map { |a| a['name'] }
+        config['applications'].map do |app|
+          app.reduce({}) { |app, (k, v)| app.merge(k.to_sym => v) }
+        end
+      end
+
+      def app_names_for_manifest(manifest)
+        apps_for_manifest(manifest).map { |a| a[:name] }
       end
 
       def app_name_for_colour(colour)

data/lib/cf/deploy/version.rb

@@ -1,5 +1,5 @@
 module CF
   class Deploy
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/spec/deploy_task_spec.rb

@@ -65,19 +65,32 @@ describe CF::Deploy do
       Rake::Task['cf:deploy:test'].invoke
     end
 
-    it 'should change memory after deployment if runtime_memory specified' do
+    it 'should change memory after deployment if runtime_memory specified in manifest' do
       Dir.chdir('spec/') do
         described_class.rake_tasks! do
-          environment :staging do
-            runtime_memory '256M'
-          end
+          environment :staging
         end
       end
 
       expect(Kernel).to receive(:system).with('cf login').ordered
-      expect(Kernel).to receive(:system).with('cf push -f manifests/staging.yml').and_return(true).ordered
+      expect(Kernel).to receive(:system).with('cf push -f manifests/staging_with_runtime.yml').and_return(true).ordered
       expect(Kernel).to receive(:system).with('cf scale staging-app -f -m 256M').and_return(true).ordered
-      Rake::Task['cf:deploy:staging'].invoke
+      Rake::Task['cf:deploy:staging_with_runtime'].invoke
+    end
+
+    it 'should change memory after deployment if runtime_memory specified in cf:deploy config' do
+      Dir.chdir('spec/') do
+        described_class.rake_tasks! do
+          environment :staging_with_runtime do
+            runtime_memory '512M'
+          end
+        end
+      end
+
+      expect(Kernel).to receive(:system).with('cf login').ordered
+      expect(Kernel).to receive(:system).with('cf push -f manifests/staging_with_runtime.yml').and_return(true).ordered
+      expect(Kernel).to receive(:system).with('cf scale staging-app -f -m 512M').and_return(true).ordered
+      Rake::Task['cf:deploy:staging_with_runtime'].invoke
     end
 
     it 'should not map routes if push command fails' do

data/spec/env_config_spec.rb

@@ -0,0 +1,13 @@
+describe CF::Deploy::EnvConfig do
+  let(:env_config) { described_class.new(:staging, 'assets:precompile', ['spec/manifests/staging_with_runtime.yml']) }
+
+  context 'when reading application names' do
+    subject { env_config[:deployments].first[:app_names] }
+    it { is_expected.to include('staging-app') }
+  end
+
+  context 'when reading application level config' do
+    subject { env_config[:deployments].first[:apps] }
+    it { is_expected.to include(a_hash_including(name: 'staging-app', runtime_memory: '256M')) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Luke Morton
@@ -100,6 +100,7 @@ files:
 - lib/cf/deploy/version.rb
 - spec/blue_green_task_spec.rb
 - spec/deploy_task_spec.rb
+- spec/env_config_spec.rb
 - spec/flip_task_spec.rb
 - spec/login_task_spec.rb
 - spec/rake_tasks_spec.rb