cf-deploy 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c13f96911baa9e48367e8364a4bd5a0cab6bfee2
+  data.tar.gz: 40048b9a6f91b11c8c6eea1083ce708e1c68e988
+SHA512:
+  metadata.gz: 78b67eb6b3e8cffb7a73f443baca3f9170c65d6e49c0cce6fe0f5019605489bf09806a598cd0853a7db94377cc5ba57468311cd42615f263714126726abc0a4c
+  data.tar.gz: 5a68c1ca42162ecd53bf1cbc964589e9888ff575da732b0711792a6c1bed0e3e7212c3d2e3fdd776d26f580cb8be584e6f8de916d482ef5174166c3c97e34a81

data/README.md

@@ -1,20 +1,25 @@
-# Rake tasks for deploying to CloudFoundry v6+
+# CloudFoundry Rails Deployment
 
-[![Code Climate](https://codeclimate.com/github/madebymade/cf-deploy/badges/gpa.svg)](https://codeclimate.com/github/madebymade/cf-deploy)
-[![Build Status](https://travis-ci.org/madebymade/cf-deploy.svg?branch=master)](https://travis-ci.org/madebymade/cf-deploy)
-[![Test Coverage](https://codeclimate.com/github/madebymade/cf-deploy/badges/coverage.svg)](https://codeclimate.com/github/madebymade/cf-deploy)
+[![Code Climate](https://codeclimate.com/github/madetech/cf-deploy/badges/gpa.svg)](https://codeclimate.com/github/madetech/cf-deploy)
+[![Build Status](https://travis-ci.org/madetech/cf-deploy.svg?branch=master)](https://travis-ci.org/madetech/cf-deploy)
+[![Test Coverage](https://codeclimate.com/github/madetech/cf-deploy/badges/coverage.svg)](https://codeclimate.com/github/madetech/cf-deploy/coverage)
 
-This gem provides the functionality you need to deploy your rails application to
-a [CloudFoundry][CloudFoundry] provider like [Pivotal][Pivotal].
+`cf-deploy` is the tool you use to deploy your rails app to
+[CloudFoundry][CloudFoundry] providers like [Pivotal][Pivotal]. It works with
+rails 4.2 and older versions as far back as rails 3.
 
-With `cf-deploy` you can:
+```
+rake cf:deploy:production
+```
 
- * Define your CloudFoundry connection details in your Rakefile or using
-   environment variables
- * Implement blue/green deployment
- * Hook into your existing rake tasks for preparing deploys/syncing assets
+## `cf-deploy` makes it easy to:
 
-## Basics
+ * Deploy your rails app with one rake command
+ * Implement blue/green deployments
+ * Run asset precompiles before deploying your app
+ * Automate your rails deploys using jenkins, circle-ci, codeship
+
+## Getting Started
 
 The functionality comes in the shape of generated rake tasks. You require this
 gem in your `Rakefile` and call the `.rake_tasks!` setup method.
@@ -33,10 +38,10 @@ bundle exec rake cf:deploy:staging
 bundle exec rake cf:deploy:production
 ```
 
-This however mimics the commands `cf push -f manifests/staging.yml` and
-`cf push -f manifests/production.yml`. Not really anything helpful or new.
-Things start to get more exciting when you define your environments in your
-`Rakefile` along with their task dependencies just like normal rake task syntax.
+You now have rake tasks that run `cf push -f manifests/staging.yml` and
+`cf push -f manifests/production.yml`. Things start to get more exciting
+when you define your environments in your `Rakefile` along with their task
+dependencies just like normal rake task syntax.
 
 ``` ruby
 require 'cf-deploy'
@@ -108,6 +113,9 @@ CF::Deploy.rake_tasks! do
     route 'example-app.io', flip: true
     route 'example-app.io', 'www', flip: true
     route 'example-app.io', 'www-origin', flip: true
+
+    route 'example-app.io', 'blue', blue: true
+    route 'example-app.io', 'green', green: true
   end
 end
 ```

data/lib/cf/deploy.rb

@@ -56,6 +56,12 @@ module CF
             cf.map_route(route, app_name)
           end
         end
+
+        unless env[:runtime_memory].nil?
+          deployment[:app_names].each do |app_name|
+            cf.scale_memory(app_name, env[:runtime_memory])
+          end
+        end
       end
     end
   end

data/lib/cf/deploy/blue_green.rb

@@ -53,12 +53,18 @@ module CF
         env[:routes].select { |r| r[:flip] == true }
       end
 
+      def flip_routes_sorted_by_hostname(env)
+        flip_routes(env).sort do |a, b|
+          a[:hostname] && a[:hostname].length > 0 ? -1 : 1
+        end
+      end
+
       def match_flip_route_grep(env)
         if flip_routes(env).empty?
           raise 'Blue/green deploys require at least one flip_route'
         end
 
-        flip_routes(env).first.values_at(:hostname, :domain).compact.join(' *')
+        flip_routes_sorted_by_hostname(env).first.values_at(:hostname, :domain).compact.join(' *')
       end
 
       def live_color(env)

data/lib/cf/deploy/commands.rb

@@ -19,6 +19,10 @@ module CF
         Kernel.system("cf stop #{app_name}")
       end
 
+      def scale_memory(app_name, memory)
+        Kernel.system("cf scale #{app_name} -m #{memory}")
+      end
+
       def map_route(route, app_name)
         Kernel.system(route_cmd(:map, route, app_name))
       end

data/lib/cf/deploy/env_config.rb

@@ -13,6 +13,7 @@ module CF
                task_name: EnvConfig.task_name(name),
                deps: deps,
                routes: [],
+               runtime_memory: nil,
                manifests: manifests)
 
         instance_eval(&block) if block_given?
@@ -74,6 +75,10 @@ module CF
         self[:manifests].concat(manifests)
       end
 
+      def runtime_memory(memory)
+        self[:runtime_memory] = memory
+      end
+
       def route(domain, hostname_or_options = nil, options = nil)
         if options.nil?
           if hostname_or_options.nil?

data/lib/cf/deploy/version.rb

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

data/spec/blue_green_task_spec.rb

@@ -28,7 +28,7 @@ describe CF::Deploy do
     it 'should deploy blue if not currently deployed' 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: '', close: nil) }
+      expect(IO).to receive(:popen).with(/cf routes \| grep '(www|www-origin) \*yourwebsite.com'/) { double(read: '', close: nil) }
       expect(Kernel).to receive(:system).with('cf push -f manifests/production_blue.yml').and_return(true).ordered
       Rake::Task['cf:deploy:production'].invoke
     end
@@ -36,7 +36,7 @@ describe CF::Deploy do
     it 'should deploy blue if green currently deployed' 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-green-app', close: nil) }
+      expect(IO).to receive(:popen).with(/cf routes \| grep '(www|www-origin) \*yourwebsite.com'/) { double(read: 'production-green-app', close: nil) }
       expect(Kernel).to receive(:system).with('cf push -f manifests/production_blue.yml').and_return(true).ordered
       Rake::Task['cf:deploy:production'].invoke
     end
@@ -44,7 +44,7 @@ describe CF::Deploy do
     it 'should deploy green if blue currently deployed' 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 '(www|www-origin) \*yourwebsite.com'/) { double(read: 'production-blue-app', close: nil) }
       expect(Kernel).to receive(:system).with('cf push -f manifests/production_green.yml').and_return(true).ordered
       Rake::Task['cf:deploy:production'].invoke
     end

data/spec/deploy_task_spec.rb

@@ -65,6 +65,21 @@ describe CF::Deploy do
       Rake::Task['cf:deploy:test'].invoke
     end
 
+    it 'should change memory after deployment if runtime_memory specified' do
+      Dir.chdir('spec/') do
+        described_class.rake_tasks! do
+          environment :staging do
+            runtime_memory '256M'
+          end
+        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 scale staging-app -m 256M').and_return(true).ordered
+      Rake::Task['cf:deploy:staging'].invoke
+    end
+
     it 'should not map routes if push command fails' do
       Dir.chdir('spec/') do
         described_class.rake_tasks! do

data/spec/flip_task_spec.rb

@@ -23,11 +23,11 @@ describe CF::Deploy 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-green-app', :close => nil) }
+        expect(IO).to receive(:popen).with(/cf routes \| grep '(www|www-origin) \*yourwebsite.com'/) { double(read: 'production-green-app', close: nil) }
         expect(Kernel).to receive(:system).with('cf map-route production-blue-app yourwebsite.com').ordered
         expect(Kernel).to receive(:system).with('cf unmap-route production-green-app yourwebsite.com').ordered
 
-        expect(IO).to receive(:popen).with("cf routes | grep 'yourwebsite.com'") { double(:read => 'production-green-app', :close => nil) }
+        expect(IO).to receive(:popen).with(/cf routes \| grep '(www|www-origin) \*yourwebsite.com'/) { double(read: 'production-green-app', close: nil) }
         expect(Kernel).to receive(:system).with('cf map-route production-blue-app yourwebsite.com -n www').ordered
         expect(Kernel).to receive(:system).with('cf unmap-route production-green-app yourwebsite.com -n www').ordered
 
@@ -43,11 +43,11 @@ describe CF::Deploy 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 '(www|www-origin) \*yourwebsite.com'/) { double(read: 'production-blue-app', close: nil) }
         expect(Kernel).to receive(:system).with('cf map-route production-green-app yourwebsite.com').ordered
         expect(Kernel).to receive(:system).with('cf unmap-route production-blue-app yourwebsite.com').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 '(www|www-origin) \*yourwebsite.com'/) { double(read: 'production-blue-app', close: nil) }
         expect(Kernel).to receive(:system).with('cf map-route production-green-app yourwebsite.com -n www').ordered
         expect(Kernel).to receive(:system).with('cf unmap-route production-blue-app yourwebsite.com -n www').ordered
 

data/spec/stop_idle_task_spec.rb

@@ -16,7 +16,7 @@ describe CF::Deploy do
       end
     end
 
-    it 'should stop green if green is currently mapped' do
+    it 'should stop blue if green is currently mapped' do
       Dir.chdir('spec/') do
         rake_tasks!
         expect(Kernel).to receive(:system).with('cf login').ordered
@@ -26,7 +26,7 @@ describe CF::Deploy do
       end
     end
 
-    it 'should stop to blue if blue is currently mapped' do
+    it 'should stop green if blue is currently mapped' do
       Dir.chdir('spec/') do
         rake_tasks!
         expect(Kernel).to receive(:system).with('cf login').ordered

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Luke Morton
@@ -10,86 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -100,13 +89,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/cf-deploy.rb
+- lib/cf/deploy.rb
 - lib/cf/deploy/blue_green.rb
 - lib/cf/deploy/commands.rb
 - lib/cf/deploy/config.rb
 - lib/cf/deploy/env_config.rb
 - lib/cf/deploy/version.rb
-- lib/cf/deploy.rb
-- lib/cf-deploy.rb
 - spec/blue_green_task_spec.rb
 - spec/deploy_task_spec.rb
 - spec/flip_task_spec.rb
@@ -114,31 +105,28 @@ files:
 - spec/rake_tasks_spec.rb
 - spec/spec_helper.rb
 - spec/stop_idle_task_spec.rb
-- LICENSE
-- README.md
 homepage: https://github.com/madebymade/cf-deploy
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rake tasks for deploying to CloudFoundry v6+
 test_files: []