labs-deployer 0.0.3 → 0.0.4

data/labs-deployer.gemspec

@@ -16,4 +16,10 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+
+
+    gem.add_dependency('s3')
+    gem.add_dependency('thor')
+
 end

data/lib/labs-deployer.rb

@@ -13,11 +13,7 @@ require 's3'
 
 class Solo < Thor
 
-  #Berkshelf.load_config
   Berkshelf::Config.new
-  AWS_ACCESS_KEY_ID      =  Chef::Config[:knife][:aws_access_key_id]
-  AWS_SECRET_ACCESS_KEY  =  Chef::Config[:knife][:aws_secret_access_key]
-  AWS_BUCKET             =  Chef::Config[:knife][:bucket]
 
   desc "package", "package and deploy a cookbook"
 
@@ -31,26 +27,23 @@ class Solo < Thor
 
   def get_dependencies()
     say "Gathering cookbook dependencies", :green
-    `mkdir -p /tmp/berkshelf-tmp`
-    invoke("berkshelf:install", [], path: "/tmp/berkshelf-tmp", berksfile: "./Berksfile")
+    FileUtils.rm_rf("/tmp/cookbooks")
+    invoke("berkshelf:install", [], path: "/tmp/cookbooks", berksfile: "./Berksfile")
   end
 
   def package_files
-    say "Packaging cookbook", :green
-    `tar zcf #{get_cookbook_name}.#{get_cookbook_version}.tgz -C /tmp/berkshelf-tmp .`
-    FileUtils.mv "#{get_cookbook_name}.#{get_cookbook_version}.tgz", '/tmp'
+    say "== Packaging cookbook", :green
+    `cd /tmp; tar zcf #{get_cookbook_name}.#{get_cookbook_version}.tgz ./cookbooks`
     return "/tmp/#{get_cookbook_name}.#{get_cookbook_version}.tgz"
   end
 
   def upload_cookbooks(file)
     service = S3::Service.new({
-                           :access_key_id     =>  AWS_ACCESS_KEY_ID,
-                           :secret_access_key =>  AWS_SECRET_ACCESS_KEY
+                           :access_key_id     =>  Chef::Config[:knife][:aws_access_key_id],
+                           :secret_access_key =>  Chef::Config[:knife][:aws_secret_access_key]
                            })
-
-    bucket = service.buckets.find(AWS_BUCKET)
-
-    say "Uploading cookbook [#{file}]", :green
+    bucket = service.buckets.find(Chef::Config[:knife][:bucket])
+    say "== Uploading cookbook [#{file}]", :green
 
     ## Only upload files, we're not interested in directories
     if File.file?(file)
@@ -59,25 +52,21 @@ class Solo < Thor
       begin
         obj = bucket.objects.find_first(remote_file)
         if yes? "This cookbook version already exists, do you want to overwrite it ?", :red
-          say "Ok, we'll overwrite it", :green
+          say "== Ok, we'll overwrite it", :green
         else
-          say "Ok, exiting", :green
+          say "== Ok, exiting", :green
           exit 0
         end
       rescue
         obj = nil
       end
 
-      ## If the object does not exist, or if the MD5 Hash / etag of the file has changed, upload it.
-      if !obj || (obj.etag != Digest::MD5.hexdigest(File.read(file)))
-        say "Uploading #{file}", :green
-        obj = bucket.objects.build(remote_file)
-        obj.content = open(file)
-        obj.content_type = MIME::Types.type_for(file).to_s
-        obj.save
-      else
-        say "Skipping duplicate file [ #{file} ]", :yellow
-      end
+      say "== Uploading #{file}", :green
+      obj = bucket.objects.build(remote_file)
+      obj.content = open(file)
+      obj.content_type = MIME::Types.type_for(file).to_s
+      obj.save
+
     end
     say "== Done syncing #{file.split('/')[-1]}",:green
   end
@@ -87,7 +76,13 @@ class Solo < Thor
   end
 
   def get_cookbook_name
-    Dir.pwd.split("/")[-1]
+    name = IO.read(Berkshelf.find_metadata).match(/^name.*/).to_s.split('"')[1]
+    if name.nil?
+      return Dir.pwd.split("/")[-1]
+    else
+      return name
+    end
+
   end
 
 end

data/lib/labs-deployer/version.rb

@@ -1,5 +1,5 @@
 module Labs
   module Deployer
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labs-deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
-dependencies: []
+date: 2012-11-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: s3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Thor tasks to package chef solo cookbooks
 email:
 - johntdyer@gmail.com
@@ -40,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510999870899918940
+      hash: -2226089765112800771
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -49,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510999870899918940
+      hash: -2226089765112800771
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24