skyed 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9135fef3c347f9bd2ffcc03c6a9621aaa8429f5f
-  data.tar.gz: ae7793935198775b5bc8afad4378b29cf337495b
+  metadata.gz: 7912136f81571d2da9daeddeb6dc1f093189bd0e
+  data.tar.gz: 0b46d44685062f11b9dc683ee05624a06c2682ba
 SHA512:
-  metadata.gz: 0219be28bd5d5fd6612e01f6f0b5cd2f55123fe0d6ae141ad3df5fcd16dc09b7bd744f403513c237b0940d72ba5687232c42cf881e726429f90f3520a2737144
-  data.tar.gz: d0decb2b5c243ae2059bd753b18282447875a5bc3387d7b484e14120d72f16ac0ceb0df3b031f97b688b148933a31fa2f1e158f09471b0a0606163b2671aa894
+  metadata.gz: f7c719e2f13638225df86460c39cdb22492c28e66fa9c5f636f978ab07c5b79c526fa97ad26860b2227df93bf63d01f68e5ac8d88ba5e46b1eebbe951bf6188e
+  data.tar.gz: 9ffdc009e20fad9e3b58bcf41ca754fc3b236609efc3c44cc82f030d2c6a7d56b177d260beb9ffcf12c5df95a5367e3a74ca1e891cda006985817e6882e5ce83

data/lib/skyed.rb

@@ -11,5 +11,5 @@ require 'skyed/settings'
 
 # Skyed is a set of tools for cloud computing
 module Skyed
-  VERSION = '0.1.6'
+  VERSION = '0.1.9'
 end

data/lib/skyed/git.rb

@@ -5,10 +5,11 @@ module Skyed
   # This module encapsulates all the Git features.
   module Git
     class << self
-      def clone_stack_remote(stack)
-        Skyed::Init.opsworks_git_key unless Skyed::Settings.current_stack?(
-         stack[:stack_id])
-        ENV['PKEY'] = Skyed::Settings.opsworks_git_key
+      def clone_stack_remote(stack, options)
+        unless Skyed::Settings.current_stack?(stack[:stack_id])
+          Skyed::Init.opsworks_git_key options
+        end
+        ENV['PKEY'] ||= Skyed::Settings.opsworks_git_key
         Skyed::Utils.create_template('/tmp', 'ssh-git', 'ssh-git.erb')
         File.chmod(0755, '/tmp/ssh-git')
         ENV['GIT_SSH'] = '/tmp/ssh-git'

data/lib/skyed/init.rb

@@ -116,7 +116,7 @@ module Skyed
         ask(question + remotes_names.to_s)
       end
 
-      def opsworks_git_key(options)
+      def opsworks_git_key(options = nil)
         question = 'Which ssh key should be used for the git repository? '
         Skyed::Settings.opsworks_git_key = options[:repo_key] || ask(question)
       end

data/lib/skyed/run.rb

@@ -14,9 +14,7 @@ module Skyed
 
       def run(_global_options, options, args)
         check_run_options(options)
-        ow = login
-        Skyed::Settings.stack_id = stack(ow, options)
-        Skyed::Settings.layer_id = layer(ow, options)
+        ow = settings(options)
         instances = Skyed::AWS::OpsWorks.running_instances(
           { layer_id: Skyed::Settings.layer_id },
           ow)
@@ -25,6 +23,13 @@ module Skyed
         execute_recipes(ow, args, instances, options)
       end
 
+      def settings(options)
+        ow = login
+        Skyed::Settings.stack_id = stack(ow, options)
+        Skyed::Settings.layer_id = layer(ow, options)
+        ow
+      end
+
       def update_custom_cookbooks(ow, stack_id, instances, wait = 0)
         status = Skyed::AWS::OpsWorks.deploy(
           stack_id: stack_id,
@@ -68,6 +73,7 @@ module Skyed
       end
 
       def check_recipes_exist(options, args)
+        settings(options)
         if !options.nil? && options.key?(:stack) && !options[:stack].nil?
           recipes = args.select { |recipe| recipe_in_remote(options, recipe) }
         else
@@ -105,7 +111,8 @@ module Skyed
 
       def recipe_in_remote(options, recipe)
         clone = Skyed::Git.clone_stack_remote(
-          Skyed::AWS::OpsWorks.stack(options[:stack], login))
+          Skyed::AWS::OpsWorks.stack(options[:stack], login),
+          options)
         recipe_in_cookbook(recipe, clone)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skyed
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ignasi Fosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git