labs-deployer 0.0.4 → 0.0.7

data/.deployer-example

@@ -0,0 +1,4 @@
+project_name: tropo/12.0/cookbooks/functional_deployment
+aws_key: 123
+aws_secret: 123
+bucket_name: cookbooks.voxeo.net

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'rake'
 gem 'berkshelf', '= 1.0.0'
 gem 'thor'
+gem 'mash'

data/README.md

@@ -18,13 +18,13 @@ Or install it yourself as:
 
 ## Usage
 
-Thos task that helps bundle and deploy cookbooks to S3.  Expects the following in your knife.rb
+Thos task that helps bundle and deploy cookbooks to S3.  Ascends path looking for .deployer file.  A local .deployer files attributes will take precedence over one in a higher scope.  The contents of this file should contain one or more of the following:
 
 ```ruby
-
-knife[:aws_access_key_id]      = "abc123"
-knife[:aws_secret_access_key]  = "abc123"
-knife[:bucket]  = 'cookbooks.myserver.com'
+bucket_name: cookbooks.something.com
+aws_key: abc
+aws_secret: 123
+project_name: tropo/12.0/cookbooks/functional_deployment
 ```
 
 ## Contributing

data/labs-deployer.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-
-
-    gem.add_dependency('s3')
-    gem.add_dependency('thor')
+  gem.add_dependency('mash')
+  gem.add_dependency('json_pure')
+  gem.add_dependency('s3')
+  gem.add_dependency('thor')
+  gem.add_dependency('berkshelf')
 
 end

data/lib/labs-deployer.rb

@@ -10,15 +10,17 @@ require 'digest/md5'
 require 'mime/types'
 require 'berkshelf/cli'
 require 's3'
-
+require 'labs-deployer/config'
 class Solo < Thor
 
   Berkshelf::Config.new
 
+
   desc "package", "package and deploy a cookbook"
 
   def package
-    get_dependencies
+    @config = VoxeoLabs::Config.new(Dir.pwd)
+    #get_dependencies
     pkg = package_files
     upload_cookbooks(pkg)
   end
@@ -39,15 +41,15 @@ class Solo < Thor
 
   def upload_cookbooks(file)
     service = S3::Service.new({
-                           :access_key_id     =>  Chef::Config[:knife][:aws_access_key_id],
-                           :secret_access_key =>  Chef::Config[:knife][:aws_secret_access_key]
-                           })
-    bucket = service.buckets.find(Chef::Config[:knife][:bucket])
+                                :access_key_id     =>  @config.aws_key, #Chef::Config[:knife][:aws_access_key_id],
+                                :secret_access_key =>  @config.aws_secret #@Chef::Config[:knife][:aws_secret_access_key]
+    })
+    bucket = service.buckets.find(@config.bucket_name)
     say "== Uploading cookbook [#{file}]", :green
 
     ## Only upload files, we're not interested in directories
     if File.file?(file)
-      remote_file = "#{get_cookbook_name}/#{file.split("/")[-1]}"
+      remote_file = "#{get_folder_name}/#{file.split("/")[-1]}"
 
       begin
         obj = bucket.objects.find_first(remote_file)
@@ -61,7 +63,7 @@ class Solo < Thor
         obj = nil
       end
 
-      say "== Uploading #{file}", :green
+      say "== Uploading #{file} to #{get_folder_name}", :green
       obj = bucket.objects.build(remote_file)
       obj.content = open(file)
       obj.content_type = MIME::Types.type_for(file).to_s
@@ -75,6 +77,14 @@ class Solo < Thor
     IO.read(Berkshelf.find_metadata).match(/^version.*/).to_s.split('"')[1]
   end
 
+  def get_folder_name
+    if @config.project_name
+      return @config.project_name
+    else
+      get_cookbook_name
+    end
+  end
+
   def get_cookbook_name
     name = IO.read(Berkshelf.find_metadata).match(/^name.*/).to_s.split('"')[1]
     if name.nil?

data/lib/labs-deployer/config.rb

@@ -0,0 +1,45 @@
+module VoxeoLabs
+  class Config
+    require 'pathname'
+    require 'yaml'
+
+    attr_reader :bucket_name, :aws_secret, :aws_key, :project_name
+
+    def initialize(path)
+      file_name=".deployer"
+
+      Pathname.new(path).ascend do |dir|
+        config_file = dir + file_name
+        if dir.children.include?(config_file)
+          merge_config(YAML::load_file(config_file))
+        end
+      end
+
+    end
+
+    private
+
+    def merge_config(config)
+
+      if config['bucket_name']
+        @bucket_name = config['bucket_name'] unless @bucket_name
+      end
+
+      if config['aws_secret']
+        @aws_secret = config['aws_secret'] unless @aws_secret
+      end
+
+      if config['aws_key']
+        @aws_key = config['aws_key'] unless @aws_key
+      end
+
+      if config['project_name']
+        @project_name = config['project_name'] unless @project_name
+      end
+
+    end
+
+  end
+end
+
+

data/lib/labs-deployer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labs-deployer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mash
+  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: json_pure
+  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: s3
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  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
@@ -50,6 +98,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .deployer-example
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -57,6 +106,7 @@ files:
 - Rakefile
 - labs-deployer.gemspec
 - lib/labs-deployer.rb
+- lib/labs-deployer/config.rb
 - lib/labs-deployer/version.rb
 homepage: ''
 licenses: []
@@ -72,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2226089765112800771
+      hash: -3720495764964049352
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,10 +131,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2226089765112800771
+      hash: -3720495764964049352
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Deployed cookbooks to s3