bbc-cosmos-tools 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2fe62898213594ae112ece7e649b43252cd876
-  data.tar.gz: f2d9b802382334839d5d0f4489e37f062647078f
+  metadata.gz: b7190ff2e94981faebca714317e92216e4158b69
+  data.tar.gz: 22c74bf8e9a3e2e7ff70360a5f05bf2999c2246f
 SHA512:
-  metadata.gz: 3fe64c5242a8920e6141bfee928c8f7d136e63efad9ccfb9c2663c429c745b5b1e4df1b2d51ea9fad9ef64358732ef6fe79eaf17eea153eedfd9cdbf8682d9e5
-  data.tar.gz: 355b1b44c9d4ca7b4df2160c8111e39b3e1e970e4ce18f2b66a4e2405f7f9d8cc3124cf4dc7a082cefbb4d6525a661f2c5d7b55250c6702d51f79db10f14b362
+  metadata.gz: 66373735b82214ca4e9b3a4c79ddaa8838dc9dfe8691f37cf135f62cfffe0945d1fb0f983b72b8aacd324624b86cdbbcbad726cae624c5416db898a98494360b
+  data.tar.gz: b2164e242b15e93c2dd73c78889b1d9fd49a20c1704534622e7773ae5237ef7f7715933c516dd187d69844098118b857da9361e6fa9c93c7db0085d052913ce1

data/lib/bbc/cosmos/tools/commands/base.rb

@@ -58,6 +58,11 @@ module BBC
             end
           end
 
+          def error(message, die = true)
+            say "#{message}\n", :red
+            exit 1 if die
+          end
+
           private
 
           def setup_config
@@ -70,11 +75,6 @@ module BBC
             )
           end
 
-          def error(message, die = true)
-            say "#{message}\n", :red
-            exit 1 if die
-          end
-
         end
       end
     end

data/lib/bbc/cosmos/tools/commands/release.rb

@@ -51,44 +51,68 @@ module BBC
           end
 
           desc "release deploy [COMPONENT = nil, RELEASE_ID = nil]", "Deploys a release to the specific enironment"
-          method_option :tags, :type => :array, :default => nil
+          method_option :tags, :type => :array, :default => nil, :desc => "The tags of the components you want to deploy (i.e 'renderer')"
+          method_option :from, :type => :string, :default => 'release', :desc => "The location that the deployment shold be taken from (release|int|test)"
           def deploy(component = nil, release_id = nil)
-            begin
 
               say banner
 
               components(options, component).each do |id|
+                begin
+
+                  component_release = release_id
+                  if release_id.nil?
+
+                    raise("From location cannot be the same as deployment location") if options[:from] == options[:env]
+                    post_data = {}
+                    endpoint = config.app['deploy']
+
+                    case options[:from]
+                    when 'release'
+                      response = api.get sprintf(config.app['release'], id)
+                      api_error response unless response.success?
+                      component_release = JSON.parse(response.body)['releases'].first['version']
+                      post_data = {
+                        'release_version' => component_release
+                      }
+                    when 'int', 'test', 'live'
+
+                      endpoint = config.app['snapshot_deploy']
+                      response = api.get sprintf(config.app['deployments'], id, options[:from])
+                      api_error response unless response.success?
+                      snapshot_id = JSON.parse(response.body).first['snapshot']['snapshot_id']
+                      post_data = {
+                        'snapshot_id' => snapshot_id
+                      }
+
+                    else
+                      raise("Invalid location: #{options[:from]} to deploy from")
+                    end
+                  end
 
-                component_release = release_id
-                if release_id.nil?
-                  response = api.get sprintf(config.app['release'], id)
-                  api_error response unless response.success?
-                  component_release = JSON.parse(response.body)['releases'].first['version']
-                end
+                  response = api.post sprintf(endpoint, options[:env], id), JSON.generate(post_data)
 
-                post_data = JSON.generate({ 'release_version' => component_release })
-                response = api.post sprintf(config.app['deploy'], options[:env], id), post_data
+                  if response.success?
 
-                if response.success?
+                    say get_key_value("\nComponent", id)
+                    say get_key_value("Version", post_data['snapshot_id'] ? post_data['snapshot_id'] : post_data['release_version'])
 
-                  say get_key_value("\nComponent", id)
-                  say get_key_value("Version", component_release)
+                    data = JSON.parse(response.body)
+                    say "\nDeployment started successfully: #{config.app['api']}#{data['url']}\n", :green
 
-                  data = JSON.parse(response.body)
-                  say "Deployment started successfully: #{config.app['api']}#{data['url']}\n", :green
+                  else
+                    api_error response
+                  end
 
-                else
-                  api_error response
+                rescue Exception => e
+                  error(e.message, false)
                 end
-
               end
 
-            rescue Exception => e
-              error e.message
-            end
           end
 
           desc "release deployed [COMPONENT = nil]", "Lists releases deloyed for a component in the specified environment"
+          method_option :tags, :type => :array, :default => nil, :desc => "The tags of the components you want to deploy (i.e 'renderer')"
           def deployed(component = nil)
             begin
 

data/lib/bbc/cosmos/tools/version.rb

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.1.2"
+        VERSION = "0.1.3"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler