berks_to_rightscale 0.0.4 → 0.0.5

data/lib/berks_to_rightscale/cli.rb

@@ -19,6 +19,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'chef'
+
 module BerksToRightscale
   class Cli < Thor
 
@@ -30,6 +32,8 @@ module BerksToRightscale
     option :no_cleanup, :desc => "Skips the removal of the cookbooks directory and the generated tar.gz file", :type => :boolean
     option :provider, :desc => "A provider listed by list_destinations which will be used to upload the cookbook release", :required => true
     option :container, :desc => "The name of the storage container to put the release file in.", :required => true
+    option :provider_options, :desc => "A comma-separated list of key=value options to pass to the fog storage provider. i.e. region=us-west-1", :required => false
+
     def release(projectname, releasename)
       output_path = ::File.join(Dir.pwd, "cookbooks")
       sym_options = {}
@@ -42,14 +46,40 @@ module BerksToRightscale
 
       fog_params = { :provider => final_opts[:provider] }
 
-      fog = ::Fog::Storage.new(fog_params)
+      if final_opts[:provider_options]
+        provider_opts = { }
+        begin
+          # convert comma-separated list to hash
+          option_list = final_opts[:provider_options].split(",")
+          provider_opts = option_list.inject({}) do |hash, kv_pair|
+            kv = kv_pair.split("=")
+            raise "ERROR: value not found." unless kv[1]
+            hash.merge({ kv[0] => kv[1] })
+          end
+        rescue
+          puts "ERROR: malformed ---provider-options parameter.  Must be in the form of 'opt1=value1,opt2=value2'. Please try again."
+          exit 1
+        end
+        # merge in provider options hash
+        fog_params.merge!(provider_opts)
+      end
+
+
+      begin
+        @fog = ::Fog::Storage.new(fog_params)
+      rescue Exception => e
+        puts "ERROR: Fog had a problem initializing storage provider: #{e.message}"
+        exit 1
+      end
 
-      unless container = fog.directories.all.detect {|cont| cont.key == final_opts[:container]}
-        raise "There was no container named #{final_opts[:container]} for provider #{final_opts[:provider]}"
+      unless container = @fog.directories.all.detect {|cont| cont.key == final_opts[:container]}
+        puts "There was no container named #{final_opts[:container]} for provider #{final_opts[:provider]}"
+        exit 1
       end
 
       if container.files.all.detect {|file| file.key == file_key} && !final_opts[:force]
-        raise "There is already a released named #{releasename} for the project #{projectname}.  If you want to overwrite it, specify the --force flag"
+        puts "There is already a released named #{releasename} for the project #{projectname}.  If you want to overwrite it, specify the --force flag"
+        exit 1
       end
 
       berksfile = ::Berkshelf::Berksfile.from_file(final_opts[:berksfile])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berks_to_rightscale
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.16.2
+        version: 11.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.16.2
+        version: 11.4.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.12.1
 description: A commandline utility which will collect cookbooks defined by berkshelf,
   compress them, and store them in S3 to be fetched by RightScale
 email: ryan.geyer@rightscale.com
@@ -101,18 +101,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1233697905389694565
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1233697905389694565
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A commandline utility which will collect cookbooks defined by berkshelf,
   compress them, and store them in S3 to be fetched by RightScale
 test_files: []
-has_rdoc: