thor-tropo 2.0.1 → 2.0.2

data/Rakefile

@@ -1,5 +1,7 @@
 #!/usr/bin/env rake
 require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+
 require 'cucumber'
 require 'cucumber/rake/task'
 

data/lib/thor-tropo.rb

@@ -14,53 +14,47 @@ module ThorTropo
   require 'berkshelf/chef'
   require 'uploader'
   require 'configuration'
+  require 'packaging'
 
   class Tasks < Thor
     include Thor::Actions
-
+    include Packaging
 
     @packaged_cookbook = nil
-
     @working_directory = nil
     @invoke_directory = Dir.pwd
 
     namespace "tropo"
 
     class_option "help",
-      :type => :boolean,
+      :type    => :boolean,
       :default => false,
       :aliases => "-h"
 
     class_option "version",
-      :type => :boolean,
+      :type    => :boolean,
       :default => false,
       :aliases => "-v"
 
     desc "package", "Package cookbooks using Berkshelf and upload file to s3 bucket"
 
     method_option :berkspath,
-      :type    => :string,
-      :aliases => "-b",
-      :default => nil,
-      :desc    => "Berksfile path"
-
-    #:banner  => "Path to find your cookbook Berksfile"
+      :type     => :string,
+      :aliases  => "-b",
+      :default  => nil,
+      :desc     => "Berksfile path"
 
     method_option :"version-override",
-      :type    => :string,
-      :aliases => "-V",
-      :default => nil,
-      :desc    => "Provide a version for cookbook archive"
-
-    #:banner  => "Provider a cookbook version rather then using metadata.rb"
+      :type     => :string,
+      :aliases  => "-V",
+      :default  => nil,
+      :desc     => "Provide a version for cookbook archive"
 
     method_option :force,
-      :type    => :boolean,
-      :aliases => "-f",
-      :default => false,
-      :desc    => "overwrite any files on s3 without confirmation"
-
-    #:banner  => "Ignore existing files and overwrite without confirmation"
+      :type     => :boolean,
+      :aliases  => "-f",
+      :default  => false,
+      :desc     => "overwrite any files on s3 without confirmation"
 
     method_option :"iam-auth",
       :type     => :boolean,
@@ -68,39 +62,29 @@ module ThorTropo
       :aliases  => "-I",
       :desc     => "Use IAM roles for AWS authorization"
 
-    #:banner   => "Will expect an IAM role is present for S3 Auth.  Useful for CI"
-
     method_option :"ignore-dirty",
       :type     => :boolean,
       :aliases  => "-i",
       :default  => false,
       :desc     => "Will ignore any dirty files in git repo and continue to package cookbooks"
 
-    #:banner   => "Ignore dirty git repository"
-
     method_option :keeplock,
       :type     => :boolean,
       :aliases  => "-k",
       :default  => false,
       :desc     => "Respect Berksfile.lock"
 
-    #:banner   => "Don't delete lockfile before running `Berks install`"
-
     method_option :"clean-cache",
       :type     => :boolean,
       :aliases  => "-c",
       :default  => false,
-
-      #:banner     => "Delete Berkshelf cookbook cache",
       :desc     => "Delete local Berkshelf cookbook cache"
 
     method_option :"no-op",
-      :type    => :boolean,
-      :aliases => "-n",
-      :default => false,
-      :desc    => "NO-OP mode, Won't actually upload anything.  Useful to see what would have happened"
-    #:banner    => "NO-OP mode",
-
+      :type     => :boolean,
+      :aliases  => "-n",
+      :default  => false,
+      :desc     => "NO-OP mode, Won't actually upload anything.  Useful to see what would have happened"
 
     def package
 
@@ -108,10 +92,7 @@ module ThorTropo
 
       $config = ThorTropo::Configuration.new(source_root)
 
-      unless clean?
-        say "[ TROPO ] - There are files that need to be committed first.", :red
-        exit 1 unless options[:"ignore-dirty"]
-      end
+      clean?
 
       clean_berks_cache if options[:"clean-cache"]
 
@@ -148,6 +129,8 @@ module ThorTropo
       :desc     => "Set a tag for the release and push to remote",
       :desc     => "Set a tag for the release and push to remote"
     def tag
+
+      clean?
       print_help_or_version
 
       if File.exists?(".git")
@@ -158,152 +141,5 @@ module ThorTropo
       end
     end
 
-    no_tasks do
-
-
-      def print_help_or_version
-        if options[:help]
-          help "package"
-          exit 0
-        elsif options[:version]
-          say "[ TROPO ] Version - #{ThorTropo::VERSION}", :blue
-          exit 0
-        end
-      end
-      def path_priorities
-        if options[:berkspath]
-          say "[ TROPO ] - Detected Berkspath was provided, so we will use this", :blue
-          ### User specified berkspath, this is highest priority
-          @working_directory = File.expand_path(options[:berkspath])
-        elsif Dir.glob("*").include?("Berksfile")
-          say "[ TROPO ] - Detected Berksfile in current directory and no --berkspath was provided.  We'll use local Berksfile.", :blue
-          ### Found berksfile in working directory
-          @working_directory = File.expand_path(".")
-        end
-
-      end
-
-      def upload_cookbook(local_file,path,opts={})
-        uploader = ThorTropo::Uploader.new({
-                                             :access_key => $config.aws_key,
-                                             :secret_key => $config.aws_secret,
-                                             :bucket     => $config.bucket_name,
-                                             :use_iam    => options[:"iam-auth"]
-        })
-
-        uploader.upload :local_file => local_file, :path => path, :force => options[:force], :noop => options[:"no-op"]
-      end
-
-      def clean_berks_cache
-        say "[ TROPO ] - Clearing local Berkshelf cookbook cache", :green
-
-        unless options[:"no-op"]
-          remove_dir (File.expand_path(File.join(Dir.home,".berkshelf","cookbooks")))
-        end
-      end
-
-      def clean?
-        sh_with_excode("cd #{source_root}; git diff --exit-code")[1] == 0
-      end
-
-      def clean_lockfile
-        berksfile = "#{source_root}/Berksfile.lock"
-
-        if File.exists? berksfile
-          say "[ TROPO ] - Removing Berksfile.lock before running Berkshelf", :blue
-          remove_file(berksfile) unless options[:"no-op"]
-        else
-          say "[ TROPO ] - Unable to find berksfile to delete - [ #{berksfile} ]", :yellow
-        end
-      end
-
-      def bundle_cookbook
-        clean_lockfile unless options[:keeplock]
-        berksfile = File.join(source_root,"/Berksfile")
-        say "[ TROPO ] - Packaging cookbooks using #{berksfile}", :blue
-        @tmp_dir = Dir.mktmpdir
-        opts = {
-          berksfile: berksfile,
-          path: "#{@tmp_dir}/cookbooks"
-        }
-
-        Dir.chdir File.dirname(berksfile)
-        invoke("berkshelf:install", [], opts)
-
-        @_invocations.except!(Berkshelf::Cli) ### Clear Berkshelf from invocations array, because apperently you can't invoke the same task twice...
-
-        output   = File.expand_path(File.join(@tmp_dir, "#{get_cookbook_name}-#{current_version}.tar.gz"))
-
-        Dir.chdir(@tmp_dir) do |dir|
-          tgz = Zlib::GzipWriter.new(File.open(output, 'wb'))
-          Archive::Tar::Minitar.pack('./cookbooks', tgz)
-        end
-        @packaged_cookbook = output
-
-      end
-
-      def get_cookbook_name
-        source_root.split("/")[-1]
-      end
-
-      def current_version
-        if options[:"version-override"]
-          options[:"version-override"]
-        else
-
-          metadata = Ridley::Chef::Cookbook::Metadata.from_file(File.join(source_root,"metadata.rb"))
-          metadata.version
-        end
-      end
-
-      def tag_version(version=nil)
-        git_tag = version || current_version
-        sh "git tag -a -m \"Version #{git_tag}\" #{git_tag}" unless options[:"no-op"]
-        say "[ TROPO ] - Tagged: #{git_tag}", :blue
-        yield if block_given?
-        sh "git push --tags" unless options[:"no-op"]
-      rescue => e
-        say "[ TROPO ] - Untagging: #{git_tag} due to error", :red
-        sh_with_excode "git tag -d #{git_tag}"
-        say "[ TROPO ] - #{e}", :red
-        exit 1
-      end
-
-      ## Get the directory to Berksfile
-      def source_root
-        berks_path = unless options[:berkspath]
-          Dir.pwd
-        else
-          @working_directory || File.expand_path(options[:berkspath])
-        end
-
-        if File.exists? berks_path
-          berks_path
-        else
-          raise Errno::ENOENT, "#{berks_path} does not contain a Berksfile"
-        end
-      end
-
-      def sh(cmd, dir = source_root, &block)
-        out, code = sh_with_excode(cmd, dir, &block)
-        code == 0 ? out : raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out)
-      end
-
-      def sh_with_excode(cmd, dir = source_root, &block)
-        cmd << " 2>&1"
-        outbuf = ''
-
-        Dir.chdir(dir) {
-          outbuf = `#{cmd}`
-          if $? == 0
-            block.call(outbuf) if block
-          end
-        }
-
-        [ outbuf, $? ]
-      end
-
-    end
-
   end
 end

data/lib/thor-tropo/configuration.rb

@@ -6,7 +6,7 @@ module ThorTropo
     require 'pathname'
     require 'yaml'
 
-    attr_reader :bucket_name, :aws_secret, :aws_key, :project_name, :cookbooks
+    attr_reader :bucket_name, :aws_secret, :aws_key, :project_name, :cookbooks, :model_name, :base_dir
 
     def initialize(path)
       file_name=".deployer"
@@ -28,6 +28,14 @@ module ThorTropo
         @bucket_name = config['bucket_name'] unless @bucket_name
       end
 
+      if config['base_dir']
+        @base_dir = config['base_dir'] unless @base_dir
+      end
+
+      if config['model_name']
+        @model_name = config['model_name'] unless @model_name
+      end
+
       if config['aws_secret']
         @aws_secret = config['aws_secret'] unless @aws_secret
       end

data/lib/thor-tropo/packaging.rb

@@ -0,0 +1,156 @@
+module ThorTropo
+  module Packaging
+
+    def sh(cmd, dir = source_root, &block)
+      out, code = sh_with_excode(cmd, dir, &block)
+      code == 0 ? out : raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out)
+    end
+
+    def sh_with_excode(cmd, dir = source_root, &block)
+      cmd << " 2>&1"
+      outbuf = ''
+
+      Dir.chdir(dir) {
+        outbuf = `#{cmd}`
+        if $? == 0
+          block.call(outbuf) if block
+        end
+      }
+
+      [ outbuf, $? ]
+    end
+
+    def print_help_or_version
+      if options[:help]
+        help "package"
+        exit 0
+      elsif options[:version]
+        say "[ TROPO ] Version - #{ThorTropo::VERSION}", :blue
+        exit 0
+      end
+    end
+
+    def get_cookbook_name
+      source_root.split("/")[-1]
+    end
+
+    def current_version
+      if options[:"version-override"]
+        options[:"version-override"]
+      else
+
+        metadata = Ridley::Chef::Cookbook::Metadata.from_file(File.join(source_root,"metadata.rb"))
+        metadata.version
+      end
+    end
+
+
+    def path_priorities
+      if options[:berkspath]
+        say "[ TROPO ] - Detected Berkspath was provided, so we will use this", :blue
+        ### User specified berkspath, this is highest priority
+        @working_directory = File.expand_path(options[:berkspath])
+      elsif Dir.glob("*").include?("Berksfile")
+        say "[ TROPO ] - Detected Berksfile in current directory and no --berkspath was provided.  We'll use local Berksfile.", :blue
+        ### Found berksfile in working directory
+        @working_directory = File.expand_path(".")
+      end
+
+    end
+
+
+    def clean_berks_cache
+      say "[ TROPO ] - Clearing local Berkshelf cookbook cache", :green
+
+      unless options[:"no-op"]
+        remove_dir (File.expand_path(File.join(Dir.home,".berkshelf","cookbooks")))
+      end
+    end
+
+    def clean?
+      if sh_with_excode("cd #{source_root}; git diff --exit-code")[1] == 0
+        true
+      else
+        say "[ TROPO ] - There are files that need to be committed first.", :red
+      end
+      exit 1 unless options[:"ignore-dirty"]
+      return true
+    end
+
+    def clean_lockfile
+      berksfile = "#{source_root}/Berksfile.lock"
+
+      if File.exists? berksfile
+        say "[ TROPO ] - Removing Berksfile.lock before running Berkshelf", :blue
+        remove_file(berksfile) unless options[:"no-op"]
+      else
+        say "[ TROPO ] - Unable to find berksfile to delete - [ #{berksfile} ]", :yellow
+      end
+    end
+
+    def upload_cookbook(local_file,path,opts={})
+      uploader = ThorTropo::Uploader.new({
+                                           :access_key => $config.aws_key,
+                                           :secret_key => $config.aws_secret,
+                                           :bucket     => $config.bucket_name,
+                                           :use_iam    => options[:"iam-auth"]
+      })
+
+      uploader.upload :local_file => local_file, :path => path, :force => options[:force], :noop => options[:"no-op"]
+    end
+
+    def bundle_cookbook
+      clean_lockfile unless options[:keeplock]
+      berksfile = File.join(source_root,"/Berksfile")
+      say "[ TROPO ] - Packaging cookbooks using #{berksfile}", :blue
+      @tmp_dir = Dir.mktmpdir
+      opts = {
+        berksfile: berksfile,
+        path: "#{@tmp_dir}/cookbooks"
+      }
+
+      Dir.chdir File.dirname(berksfile)
+      invoke("berkshelf:install", [], opts)
+
+      @_invocations.except!(Berkshelf::Cli) ### Clear Berkshelf from invocations array, because apperently you can't invoke the same task twice...
+
+      output   = File.expand_path(File.join(@tmp_dir, "#{get_cookbook_name}-#{current_version}.tar.gz"))
+
+      Dir.chdir(@tmp_dir) do |dir|
+        tgz = Zlib::GzipWriter.new(File.open(output, 'wb'))
+        Archive::Tar::Minitar.pack('./cookbooks', tgz)
+      end
+      @packaged_cookbook = output
+
+    end
+
+
+    def tag_version(version=nil)
+      git_tag = version || current_version
+      sh "git tag -a -m \"Version #{git_tag}\" #{git_tag}" unless options[:"no-op"]
+      say "[ TROPO ] - Tagged: #{git_tag}", :blue
+      yield if block_given?
+      sh "git push --tags" unless options[:"no-op"]
+    rescue => e
+      say "[ TROPO ] - Untagging: #{git_tag} due to error", :red
+      sh_with_excode "git tag -d #{git_tag}"
+      say "[ TROPO ] - #{e}", :red
+      exit 1
+    end
+
+    ## Get the directory to Berksfile
+    def source_root
+      berks_path = unless options[:berkspath]
+        Dir.pwd
+      else
+        @working_directory || File.expand_path(options[:berkspath])
+      end
+
+      if File.exists? berks_path
+        berks_path
+      else
+        raise Errno::ENOENT, "#{berks_path} does not contain a Berksfile"
+      end
+    end
+  end
+end

data/lib/thor-tropo/uploader.rb

@@ -60,7 +60,7 @@ module ThorTropo
 
       def setup_connection(u,p)
 
-        fog_args = { :provider => 'AWS' }
+        fog_args = { :provider => 'AWS', path_style: !ENV['FOG_USE_PATH_STYLE'].nil? }
 
         if @use_iam
           fog_args[:use_iam_profile] = true
@@ -105,7 +105,7 @@ module ThorTropo
           public_url = " *** NOOP ** /#{remote_file}"
 
         end
-          say "[ TROPO ] - Public URL: #{public_url}", :blue
+          say "[ TROPO ] - Public URL: #{public_url.gsub("https","http")}", :blue
 
       end
 

data/thor-tropo.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-tropo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.6'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,7 @@ files:
 - changelog.md
 - lib/thor-tropo.rb
 - lib/thor-tropo/configuration.rb
+- lib/thor-tropo/packaging.rb
 - lib/thor-tropo/uploader.rb
 - lib/thor-tropo/version.rb
 - lib/thor/tropo.rb
@@ -319,12 +320,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4522265901803536206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4522265901803536206
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -332,4 +339,3 @@ signing_key:
 specification_version: 3
 summary: Set of tasks to assist in making packages from a git controlled project.
 test_files: []
-has_rdoc: