bbc-cosmos-tools 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cd0367e530b4c48f9c1cbec21d0832fb249849
-  data.tar.gz: 5255edaba086f47db45c227ff3ed2868cd7c51f0
+  metadata.gz: 204d2769528dc7478f8989d2a95838703b341c1e
+  data.tar.gz: edc6e26631b88bb768c7fb9e1bb317e8c7995748
 SHA512:
-  metadata.gz: 05faaf59a12f88c2a52774c1e9faf36795acc2da85138ebfe9cc79889ff93d2491304edf76acdac0808be2fc0c291c7585b53f5ff28408cc0dd3324605602e1d
-  data.tar.gz: 6fe251bf659206f15e033529729d0021854c90e21cb1a62392c1175de44c4af1b9da6831a3f85634a793054f2ad0a4aa93f896c3c04fe356bb7f5caac5eb75db
+  metadata.gz: fff3c9de80096d918b73051529ced1a1bf116712b1130a5262ebbf440d3fa862beb99f7ff7dbeb449205259a58989b785b12322133139e0a758bda6bd1319063
+  data.tar.gz: b1dc7fc87cc39170975caef9cae71ed5bff5c3864d6e7833e0ca5cc31a705676c8da7a213442bae6c4686296d16d63a3e30c816ac8918df750d661155a334fdb

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

@@ -4,6 +4,21 @@ require "bbc/cosmos/tools/commands/base"
 require "bbc/cosmos/tools/cosmos_configuration"
 require "bbc/cosmos/tools/api"
 
+class IncorrectUrlException < StandardError
+  def initialize(msg)
+    super
+  end
+end
+
+class NullResponse
+  def success?
+    false
+  end
+  def body
+    JSON.generate({})
+  end
+end
+
 module BBC
   module Cosmos
     module Tools
@@ -84,7 +99,13 @@ module BBC
                   end
                 end
 
-                response = api.post sprintf(endpoint, options[:env], id), JSON.generate(post_data)
+                response = begin
+                             check_config
+                             api.post sprintf(endpoint, options[:env], id), JSON.generate(post_data)
+                           rescue IncorrectUrlException => e
+                             say "\nWarning: #{e.message}\n", :red
+                             NullResponse.new
+                           end
 
                 if response.success?
 
@@ -92,7 +113,7 @@ module BBC
                   say get_key_value("Version", post_data["snapshot_id"] ? post_data["snapshot_id"] : post_data["release_version"])
 
                   data = JSON.parse(response.body)
-                  say "\nDeployment started successfully: #{config.app['api']}#{data['url']}\n", :green
+                  say "\nDeployment started successfully: #{config.app['admin']}/cosmos#{data['url']}\n", :green
 
                 else
                   api_error response
@@ -155,6 +176,10 @@ module BBC
 
           private
 
+          def check_config
+            raise IncorrectUrlException.new("Your configs/app.yaml is missing -> admin: 'https://admin.live.bbc.co.uk'") unless config.app.has_key? "admin"
+          end
+
           def start_redeploy(component, id)
             post_data = { "deployment_id" => id }
             endpoint = "/cosmos/env/#{options[:env]}/component/#{component}/redeploy"

data/lib/bbc/cosmos/tools/types/base_type.rb

@@ -15,7 +15,9 @@ module BBC
           def generate_data(to_json = false)
             if valid_component_and_stack
               get_parameters.each do |key, value|
-                data["Parameters"][key]["Default"] = value if data["Parameters"][key]
+                if data.has_key?("Parameters") && data["Parameters"][key]
+                  data["Parameters"][key]["Default"] = value
+                end
               end
               to_json ? JSON.pretty_generate(data) : data
             end
@@ -39,7 +41,7 @@ module BBC
           end
 
           def get_parameters
-            @config.resources["cloudformation"]["components"][@id][@options[:stack]]["variants"][@options[:variant]]
+            @config.resources["cloudformation"]["components"][@id][@options[:stack]]["variants"][@options[:variant]] || []
           end
         end
       end

data/lib/bbc/cosmos/tools/types/json.rb

@@ -9,7 +9,7 @@ module BBC
           protected
 
           def data
-            JSON.parse(IO.read(construct_file_path "json"))
+            @json ||= JSON.parse(IO.read(construct_file_path "json"))
           end
         end
       end

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

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-      VERSION = "0.7.0"
+      VERSION = "0.8.0"
     end
   end
 end

metadata

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