skyed 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7912136f81571d2da9daeddeb6dc1f093189bd0e
-  data.tar.gz: 0b46d44685062f11b9dc683ee05624a06c2682ba
+  metadata.gz: e4940c6e2a8a3df68f9e3f68acd1aa8fdae2b12f
+  data.tar.gz: 869c118fc70c08c7af21923620e858f5a7c35ffc
 SHA512:
-  metadata.gz: f7c719e2f13638225df86460c39cdb22492c28e66fa9c5f636f978ab07c5b79c526fa97ad26860b2227df93bf63d01f68e5ac8d88ba5e46b1eebbe951bf6188e
-  data.tar.gz: 9ffdc009e20fad9e3b58bcf41ca754fc3b236609efc3c44cc82f030d2c6a7d56b177d260beb9ffcf12c5df95a5367e3a74ca1e891cda006985817e6882e5ce83
+  metadata.gz: 6ebb691ec6afb34527190e04ec6fc967faf76ae8cbc712746f5d1b2c9b67ea82ca6045265abbcbaedf0f7e3f0d22ae41012bc4e2399357a713a743ec331f2a43
+  data.tar.gz: f81af1bd091b21664c915e84a8ddd8b41e1629f7f572cf97168983a327baf5800249b8cc6c0c718ac51ac09573402f8cf44a2bb0c66d01a94ad03c65369b919f

data/lib/skyed/git.rb

@@ -5,16 +5,23 @@ module Skyed
   # This module encapsulates all the Git features.
   module Git
     class << self
+      def clone_cmd(stack, path)
+        cmd = 'export GIT_SSH=/tmp/ssh-git; '
+        cmd += 'git clone --branch '
+        cmd += stack[:custom_cookbooks_source][:revision]
+        cmd += " #{stack[:custom_cookbooks_source][:url]} "
+        cmd += path
+        cmd
+      end
+
       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'
+        Skyed::Utils.create_template('/tmp', 'ssh-git', 'ssh-git.erb', 0755)
         path = "/tmp/skyed.#{SecureRandom.hex}"
-        ::Git.clone(stack[:custom_cookbooks_source][:url], path)
+        `#{clone_cmd(stack, path)}`
         path
       end
     end

data/lib/skyed/run.rb

@@ -79,7 +79,7 @@ module Skyed
         else
           recipes = args.select { |recipe| recipe_in_cookbook(recipe) }
         end
-        msg = "Couldn't found #{args - recipes} recipes in repository"
+        msg = "Couldn't find #{args - recipes} recipes in repository"
         fail msg unless recipes == args
         recipes
       end

data/lib/skyed/utils.rb

@@ -9,17 +9,17 @@ module Skyed
         ENV['AWS_SECRET_KEY'] = Skyed::Settings.secret_key
       end
 
-      def create_template(base, subpath, template_file)
+      def create_template(base, subpath, template_file, mode = 0644)
         b = binding
         folders = subpath.split('/')
-        template = ERB.new(
-          File.read(File.join(
-              File.dirname(File.dirname(File.dirname(__FILE__))),
-              'templates',
-              template_file)))
+        template = ERB.new(File.read(File.join(
+          File.dirname(File.dirname(File.dirname(__FILE__))),
+          'templates',
+          template_file)))
         File.open(File.join(base, folders), 'w') do |f|
           f.write(template.result b)
         end
+        File.chmod(mode, File.join(base, folders))
       end
 
       def read_key_file(key_file)

metadata

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