bbc-cosmos-tools 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 682aa789050e6b06223d07a9da105df6abdc966d
-  data.tar.gz: 2256eaa0c3a4c060fb26fdaa8fa637796602723c
+  metadata.gz: 33f0ae16de67d0b0f168224dcd626d309b267f41
+  data.tar.gz: 4abd19d8284fe959724fefea4e595d5eb5bd0bb4
 SHA512:
-  metadata.gz: 8cb7f2f87c0d45e710caa0fd6f85b887410927bd37570894cfbee4eb88d7bd8df4c2976a14bd2a5e05bb505b52e95a950ec5ea7192b55e9fdf81c22643264188
-  data.tar.gz: 9b4b400d1c6cd2da4bb81c22518dfb5ee8e80217a9b7f3879bbec47cd50edbce62bf9a0478c87131e4f60b37b9318b68150f1170d101565815b45a78ffa021cc
+  metadata.gz: b87ca39df5f43f6dbfb3975ccf0e7158ccef62943658f14f4c6f26c9f7414e9e27d6000c75855788dc24c0f8a9366bcc7cd730fa1688dead1e3c9ace42806591
+  data.tar.gz: 70670e8e77bac0d593c2f42d4c3cce2a715ef3943b36c5e274727b24410cc675dd91d245043ddfdc6268103ded5dee268638a259f3d515d014075c9e4aa26102

data/README.md

@@ -354,6 +354,12 @@ bbc-cosmos-tools stack generate {cosmos_component_name} \
 
 > Note: in case you're not a CLI wizard, instead of specifying the `--key-path` option you can set a `$DEV_CERT_PATH` environment variable that the tool uses by default if it detects it. Inside your shell's configuration file (either `~/.bashrc` or `~/.zshrc`) you'll want to add `export DEV_CERT_PATH=/custom/path/to/your/pem/certificate`
 
+Deploy component to a specific environment:
+
+```sh
+bbc-cosmos-tools release deploy <component> --project=<project> --from=X --env=Y
+```
+
 ### Using YAML or JSON
 
 Use the same commands as above but make sure to include a `--type={yaml|json}`. If it's not specified then `cfndsl` is assumed as the default (almost as if you had written `--type=cfndsl`, but it's clearer to just remove the flag in that instance).

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

@@ -29,8 +29,9 @@ module BBC
             print_table build_table(headers, rows)
           end
 
-          desc "SSH <COMPONENT>", "Gain SSH"
+          desc "ssh <COMPONENT>", "Gain SSH"
           def ssh(component)
+            say banner(component) + "\n"
             meta = make_request("env/#{options[:env]}/component/#{component}/instances")
 
             meta.count == 1 ? single_instance(component, meta)
@@ -55,10 +56,23 @@ module BBC
           end
 
           def session(component, instance_id, ip_address)
-            post_data(component, instance_id)
+            response = post_data(component, instance_id)
+            check_status(response)
             output_message(component, ip_address, instance_id)
           end
 
+          def check_status(login)
+            url = JSON.parse(login.body)['url']
+            status = "pending_creation"
+            say "\n"
+            until status == "current"
+              sleep 2
+              say "Creating Session", :yellow
+              status = make_request(url)["status"]
+              fail Exception, (say "SSH Failed"; :red) if status == "failed"
+            end
+          end
+
           def select_instance(meta)
             choose do |menu|
               say "Multiple instances detected, please select one", :green
@@ -74,7 +88,7 @@ module BBC
           end
 
           def output_message(component, ip, id)
-            say "SSH setup for #{component} on #{options[:env]}, your IP for #{id} is #{ip}", :green
+            say "\nYour IP for #{id} is #{ip}", :green
           end
 
           def post_data(component, id)

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

@@ -125,7 +125,7 @@ module BBC
 
               if data["Parameters"]
                 data["Parameters"] = deep_merge(
-                  stack_parameters(stack_meta["parameters"]),
+                  stack_parameters(stack_meta["parameters"], data["Parameters"]),
                   data["Parameters"]
                 )
 
@@ -202,12 +202,10 @@ module BBC
 
           private
 
-          def stack_parameters(stack_data)
+          def stack_parameters(stack_data, new_params)
             stack_data.reduce({}) do |accum, (key, value)|
               accum.tap do |a|
-                a[key] = {
-                  "Default" => value["value"]
-                }
+                a[key] = { "Default" => value["value"] } if new_params.has_key? key
               end
             end
           end

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

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-      VERSION = "0.6.0"
+      VERSION = "0.6.1"
     end
   end
 end

metadata

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