thor-tropo 1.1.0 → 1.2.0

data/changelog.md

@@ -0,0 +1,5 @@
+#1.2.0
+
+* Improve logging
+* Bundle foodcritic thor tasks
+* Allow version to be overridden 

data/lib/thor-tropo.rb

@@ -6,6 +6,7 @@ module ThorTropo
   require 'thor'
   require 'thor/actions'
   require 'thor/scmversion'
+  require 'thor/foodcritic'
   require 'tmpdir'
   require 'archive/tar/minitar'
   require 'zlib'
@@ -30,6 +31,15 @@ module ThorTropo
       :aliases => "-v",
       :default => false
 
+    desc "package", "Package cookbooks and upload to S3"
+
+    method_option :"version-override",
+      :type    => :string,
+      :aliases => "-V",
+      :default => nil,
+      :desc    => "Force override of version number",
+      :banner  => "Force override of cookbook version"
+
     method_option :force,
       :type    => :boolean,
       :aliases => "-f",
@@ -57,7 +67,12 @@ module ThorTropo
       :desc     => "Delete lockfile before running `Berks install`",
       :banner   => "Delete lockfile before running `Berks install`"
 
-    desc "package", "Package cookbooks and upload to S3"
+    # def version
+    #   OLDVERSION=`sed -n -e "s/version.*\"\(.*\)\"/\1/p" metadata.rb`
+    #   sed -ie "s/\(version *\)\".*\"/\1\"$OLDVERSION\"/" metadata.rb
+    #   git add metadata.rb
+    # end
+
 
     def package
 
@@ -140,8 +155,12 @@ module ThorTropo
       end
 
       def current_version
-        metadata = Ridley::Chef::Cookbook::Metadata.from_file(File.join(options[:called_path],"metadata.rb"))
-        metadata.version
+        if options[:"version-override"]
+          options[:"version-override"]
+        else
+          metadata = Ridley::Chef::Cookbook::Metadata.from_file(File.join(options[:called_path],"metadata.rb"))
+          metadata.version
+        end
       end
 
       def tag_version

data/lib/thor-tropo/uploader.rb

@@ -78,7 +78,7 @@ module ThorTropo
         local_file  = opts[:local_file]
         remote_file = opts[:remote_file]
 
-        say "[ TROPO ] - Uploading file.", :blue
+        say "[ TROPO ] - Uploading file. [#{File.basename(opts[:local_file])}", :blue
         unless opts[:noop]
           file = @bucket_name.files.create(
             :key    => remote_file,

data/thor-tropo.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |gem|
   gem.version       = ThorTropo::VERSION
 
   #gem.add_dependency 'json', ">= 1.7.0"
-  gem.add_dependency 'thor'
   gem.add_dependency 'chef', "~> 11.0"
   gem.add_dependency 'berkshelf'
-  gem.add_dependency 'thor-scmversion'
   gem.add_dependency 'minitar',           '~> 0.5.4'
-  gem.add_dependency 'aws-sdk'
   gem.add_dependency 'fog'
+  gem.add_dependency 'thor'
+  gem.add_dependency 'thor-scmversion'
+  gem.add_dependency 'thor-foodcritic'
 
   gem.add_development_dependency 'foodcritic'
   gem.add_development_dependency 'webmock'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-tropo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,55 +12,55 @@ cert_chain: []
 date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: berkshelf
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: thor-scmversion
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,23 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: thor-scmversion
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: thor-foodcritic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -299,6 +299,7 @@ files:
 - Thorfile
 - VERSION
 - bin/scmversion
+- changelog.md
 - lib/thor-tropo.rb
 - lib/thor-tropo/configuration.rb
 - lib/thor-tropo/uploader.rb