hem 1.0.1.beta6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 464afc8e551b0a00daad552544ab7d939d0fb0f0
-  data.tar.gz: c36788f90cb8a124df6fd45efb8f2872ef05093d
+  metadata.gz: 9f00e9f984cfc0962397a24b9bdf60183723a957
+  data.tar.gz: c7d3b06d842443da2b534f83fb751b7b2ae89858
 SHA512:
-  metadata.gz: 5126f005b480789a700e71c442aca4f9443ee45bec148abb7bacd2abdb81b3dd6396381384af602127c410cce5aebdc7231932e3dfd5a100db64b86034b12d91
-  data.tar.gz: ad45a6aba07525e19a4d2c5a6c3de35a0eb3932e826e8d8b8ec5f04d3a87fa04a0b42b3cfd8ba21589300ff96125b72bf84b6639d50e57ac4c1648a4ce29693f
+  metadata.gz: 41f8b0a2edda8503154da2fde23b87ee507c0da76f6b5d737b874ae242bb55cccdcb4b66a18ef31138619ae643155a17dea1769c327ed3b4a07b29b115dace99
+  data.tar.gz: ad3771fc35f6a0e76495904e1205d6afda03bfb79bfa2acc1d3c1890a53eb0d547da22948683cdd9e39b056647eef3f1057d505b8fa53bada45ab2a2c6fd2539

data/Gemfile.lock

@@ -1,64 +1,51 @@
 PATH
   remote: .
   specs:
-    hem (1.0.1.beta6)
-      aws-sdk (~> 2.0.24)
-      deepstruct (~> 0.0.5)
-      highline (~> 1.6.20)
+    hem (1.1.0)
+      aws-sdk (~> 2.3.8)
+      deepstruct (~> 0.0.7)
+      highline (~> 1.7.3)
+      jmespath (~> 1.1.3)
+      json (~> 1.8.1)
       net-ssh-simple (~> 1.6.3)
-      octokit (~> 3.0)
-      pry (~> 0.9.12)
-      rake (~> 10.1.1)
-      ruby-progressbar (~> 1.4.1)
-      semantic (~> 1.3.0)
-      slop (~> 3.4.7)
+      pry (~> 0.10.3)
+      rake (~> 11.1.2)
+      ruby-progressbar (~> 1.8.1)
+      slop (~> 3.6.0)
       teerb (~> 0.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
-    aws-sdk (2.0.48)
-      aws-sdk-resources (= 2.0.48)
-    aws-sdk-core (2.0.48)
-      builder (~> 3.0)
+    aws-sdk (2.3.8)
+      aws-sdk-resources (= 2.3.8)
+    aws-sdk-core (2.3.8)
       jmespath (~> 1.0)
-      multi_json (~> 1.0)
-    aws-sdk-resources (2.0.48)
-      aws-sdk-core (= 2.0.48)
-    blockenspiel (0.4.5)
-    builder (3.2.2)
-    coderay (1.1.0)
+    aws-sdk-resources (2.3.8)
+      aws-sdk-core (= 2.3.8)
+    blockenspiel (0.5.0)
+    coderay (1.1.1)
     deepstruct (0.0.7)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.4.3)
-    highline (1.6.21)
+    hashie (3.4.4)
+    highline (1.7.8)
     jmespath (1.1.3)
+    json (1.8.3)
     method_source (0.8.2)
-    multi_json (1.11.2)
-    multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
-    net-ssh-simple (1.6.12)
-      blockenspiel (= 0.4.5)
-      hashie (= 3.4.3)
+    net-ssh (3.1.1)
+    net-ssh-simple (1.6.15)
+      blockenspiel (= 0.5.0)
+      hashie (= 3.4.4)
       net-scp (= 1.2.1)
-      net-ssh (= 3.0.1)
-    octokit (3.8.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      net-ssh (= 3.1.1)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.1.1)
-    ruby-progressbar (1.4.2)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    semantic (1.3.1)
-    slop (3.4.7)
+    rake (11.1.2)
+    ruby-progressbar (1.8.1)
+    slop (3.6.0)
     teerb (0.0.1)
 
 PLATFORMS
@@ -68,4 +55,4 @@ DEPENDENCIES
   hem!
 
 BUNDLED WITH
-   1.10.6
+   1.12.4

data/Hemfile

@@ -24,7 +24,8 @@ namespace :test do
   long_desc "long description"
   option "-o", "--option", "Option description"
   hidden true
-  task "metadata", [ :arg ] do
+  argument 'arg'
+  task "metadata" do
     Hem.ui.info "metadata"
   end
 
@@ -33,7 +34,8 @@ namespace :test do
     Hem.ui.info task.opts[:testing]
   end
 
-  task 'argument-test', [ :test ] do |task, args|
+  argument 'test'
+  task 'argument-test' do |task, args|
     Hem.ui.info args[:test]
   end
 

data/README.md

@@ -10,6 +10,10 @@ Many more features are planned including assisting with host machine configurati
 
 # Installing & using
 
+* [OSX](https://github.com/inviqa/hem/wiki/Installing-on-OSX)
+* [Linux](https://github.com/inviqa/hem/wiki/Installing-on-Linux)
+* [Windows](https://github.com/inviqa/hem/wiki/Installing-on-Windows)
+
 Full instructions for installing and using hem are available in the [User guide](https://github.com/inviqa/hem/wiki/User-guide). For information on the task DSL, see the  [DSL guide](https://github.com/inviqa/hem/wiki/Hemfile-DSL).
 
 Please ensure that you run the following command after installing and that it does not raise any issues:

data/bin/hem

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
 
-# Hack to allow testing with Aruba (for now)
-$:.push File.expand_path(File.join("..", "..", "lib"), __FILE__)
-
 def init_hem
-  require 'hem'
+  require_relative '../lib/hem/setup'
 
   # Default main classes
   error_handler = Hem::ErrorHandlers::Friendly.new
@@ -12,6 +9,8 @@ def init_hem
   Hem.logger = Logger.new(STDOUT)
   Hem.logger.level = Logger::WARN
 
+  Hem.plugins = Hem::Plugins.new(Hem.project_path || Hem.config_path, Hem.project_dsl_file)
+
   # Low level / early arg parsing
   # Anything that can alter ui / logger / cli should be here
   # Early termination args should also go here
@@ -49,13 +48,13 @@ def init_hem
     Hem.cli = Hem::Cli.new(slop: slop)
     Hem.cli.start
   rescue Exception => error
-    exit error_handler.handle(error)
+    exit error_handler.handle(Hem.cli, error)
   end
 end
 
 Gem.configuration.verbose = false
 
-require 'hem/patches/rubygems'
+require_relative '../lib/hem/patches/rubygems'
 
 # Suppress Net/SSH/Simple warning on windows
 $SUPPRESS_32BIT_WARNING=1

data/hem.gemspec

@@ -6,9 +6,9 @@ require 'hem/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "hem"
-  spec.version       = Hem::VERSION.gsub('-', '.')
-  spec.authors       = ["Mike Simons"]
-  spec.email         = ["msimons@inviqa.com"]
+  spec.version       = Hem::VERSION
+  spec.authors       = ["Mike Simons", "Andy Thompson"]
+  spec.email         = ["athompson@inviqa.com"]
   spec.description   = %q{Inviqan toolbelt}
   spec.summary       = %q{Inviqan toolbelt}
   spec.homepage      = ""
@@ -20,28 +20,28 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "slop", "~> 3.4.7"
-  spec.add_dependency "highline", "~> 1.6.20"
-  spec.add_dependency "rake", "~> 10.1.1"
-  spec.add_dependency "deepstruct", "~> 0.0.5"
-  spec.add_dependency "semantic", "~> 1.3.0"
-  spec.add_dependency "aws-sdk", "~> 2.0.24"
-  spec.add_dependency "ruby-progressbar", "~> 1.4.1"
-  spec.add_dependency "teerb", "~> 0.0.1"
+  spec.add_dependency "aws-sdk", "~> 2.3.8"
+  spec.add_dependency "deepstruct", "~> 0.0.7"
+  spec.add_dependency "highline", "~> 1.7.3"
+  spec.add_dependency "jmespath", "~> 1.1.3"
+  spec.add_dependency "json", "~> 1.8.1"
   spec.add_dependency "net-ssh-simple", "~> 1.6.3"
-  spec.add_dependency "pry", "~> 0.9.12"
-  spec.add_dependency "octokit", "~> 3.0"
+  spec.add_dependency "pry", "~> 0.10.3"
+  spec.add_dependency "rake", "~> 11.1.2"
+  spec.add_dependency "ruby-progressbar", "~> 1.8.1"
+  spec.add_dependency "slop", "~> 3.6.0"
+  spec.add_dependency "teerb", "~> 0.0.1"
 
   # This prevents Bundler.setup from complaining that rubygems did not install dev deps
   # If you want to run dev deps you need to ensure HEM_ENV=dev is set for bundle install & bundle exec
   if ENV['HEM_ENV'] == 'dev'
     spec.add_development_dependency "aruba", "~> 0.5.4"
-    spec.add_development_dependency "rspec", "~> 2.14.1"
     spec.add_development_dependency "fakefs", "~> 0.5.0"
-    spec.add_development_dependency "rr", "~> 1.1.2"
     spec.add_development_dependency "guard", "~> 2.2.5"
     spec.add_development_dependency "guard-rspec", "~> 4.2.4"
     spec.add_development_dependency "guard-cucumber", "~> 1.4.1"
+    spec.add_development_dependency "rr", "~> 1.1.2"
+    spec.add_development_dependency "rspec", "~> 2.14.1"
     spec.add_development_dependency "simplecov", "~> 0.7.1"
   end
 end

data/lib/hem.rb

@@ -3,72 +3,74 @@ require 'slop'
 require 'rake'
 require 'deepstruct'
 require 'logger'
+require 'json'
 
 require 'shellwords'
 require 'fileutils'
 
 # DSL enhancements
-require 'hem/metadata'
-require 'hem/patches/rake'
-require 'hem/patches/slop'
-require 'hem/patches/deepstruct'
+require_relative 'hem/metadata'
+require_relative 'hem/patches/rake'
+require_relative 'hem/patches/slop'
+require_relative 'hem/patches/deepstruct'
 
 # Basics
-require 'hem/version'
-require 'hem/null'
-require 'hem/paths'
-require 'hem/errors'
-require 'hem/logging'
-require 'hem/ui'
-require 'hem/util'
-require 'hem/help_formatter'
-require 'hem/error_handlers/exit_code_map'
-require 'hem/error_handlers/debug'
-require 'hem/error_handlers/friendly'
-require 'hem/config/file'
-require 'hem/config'
+require_relative 'hem/version'
+require_relative 'hem/null'
+require_relative 'hem/paths'
+require_relative 'hem/errors'
+require_relative 'hem/logging'
+require_relative 'hem/plugins'
+require_relative 'hem/ui'
+require_relative 'hem/util'
+require_relative 'hem/help_formatter'
+require_relative 'hem/error_handlers/exit_code_map'
+require_relative 'hem/error_handlers/debug'
+require_relative 'hem/error_handlers/friendly'
+require_relative 'hem/config/file'
+require_relative 'hem/config'
 
 # Asset sync
-require 'hem/lib/s3/sync'
-require 'hem/lib/s3/local/file'
-require 'hem/lib/s3/local/iohandler'
-require 'hem/lib/s3/remote/file'
-require 'hem/lib/s3/remote/iohandler'
+require_relative 'hem/lib/s3/sync'
+require_relative 'hem/lib/s3/local/file'
+require_relative 'hem/lib/s3/local/iohandler'
+require_relative 'hem/lib/s3/remote/file'
+require_relative 'hem/lib/s3/remote/iohandler'
 
 # Task helpers
-require 'hem/helper/command'
-require 'hem/helper/shell'
-require 'hem/helper/file_locator'
-require 'hem/helper/github'
-require 'hem/helper/http_download'
-require 'hem/helper/vm_command'
+require_relative 'hem/helper/argument_parser'
+require_relative 'hem/helper/command'
+require_relative 'hem/helper/shell'
+require_relative 'hem/helper/file_locator'
+require_relative 'hem/helper/github'
+require_relative 'hem/helper/http_download'
+require_relative 'hem/helper/vm_command'
 
-require 'hem/lib/local/command'
+require_relative 'hem/lib/local/command'
 
-require 'hem/lib/vm/inspector'
-require 'hem/lib/vm/command'
+require_relative 'hem/lib/vm/inspector'
+require_relative 'hem/lib/vm/command'
 
 # Asset applicators
-require 'hem/asset_applicator'
-require 'hem/asset_applicators/sqldump'
-require 'hem/asset_applicators/files'
+require_relative 'hem/asset_applicator'
+require_relative 'hem/asset_applicators/sqldump'
+require_relative 'hem/asset_applicators/files'
 
 # Libs
-require 'hem/lib/seed/project'
-require 'hem/lib/seed/replacer'
-require 'hem/lib/seed/seed'
-require 'hem/lib/self_signed_cert_generator'
-require 'hem/lib/github/api'
-require 'hem/lib/github/client'
+require_relative 'hem/lib/seed/project'
+require_relative 'hem/lib/seed/replacer'
+require_relative 'hem/lib/seed/seed'
+require_relative 'hem/lib/seed/template'
+require_relative 'hem/lib/self_signed_cert_generator'
 
 # Host checks
-require 'hem/lib/host_check/git'
-require 'hem/lib/host_check/vagrant'
-require 'hem/lib/host_check/deps'
-require 'hem/lib/host_check'
+require_relative 'hem/lib/host_check/git'
+require_relative 'hem/lib/host_check/vagrant'
+require_relative 'hem/lib/host_check/deps'
+require_relative 'hem/lib/host_check'
 
 # App
-require 'hem/cli'
+require_relative 'hem/cli'
 
 # Hobo BC
 Hobo = Hem

data/lib/hem/asset_applicators/files.rb

@@ -1,5 +1,5 @@
 # Built in applicators
 Hem.asset_applicators.register 'files', /.*\.files\.(tgz|tar\.gz|tar\.bz2)/ do |file, _|
   Hem.ui.title "Applying file dump (#{file})"
-  run_command "tar -xvf #{file.shellescape}"
+  run "tar -xvf #{file.shellescape}"
 end

data/lib/hem/cli.rb

@@ -27,6 +27,7 @@ module Hem
       @help_formatter = opts[:help] || Hem::HelpFormatter.new(@slop)
       @help_opts = {}
       @host_check = opts[:host_check] || Hem::Lib::HostCheck
+      @pre_task_namespaces = ['shell-init', 'plugin']
     end
 
     # entry point for application
@@ -36,9 +37,7 @@ module Hem
       load_builtin_tasks
       load_hemfiles
       load_project_config
-      Hem.chefdk_compat
 
-      tasks = structure_tasks Hem::Metadata.metadata.keys
       define_global_opts @slop
 
       begin
@@ -46,21 +45,22 @@ module Hem
         @slop.parse! args
         opts = @slop.to_hash
 
-        perform_host_checks unless opts[:'skip-host-checks']
-
         @help_opts[:all] = opts[:all]
 
-        @slop.add_callback :empty do
-          show_help
-        end
-
         # Necessary to make command level help work
-        args.push "--help" if @slop.help?
+        args.push "--help" if @slop.help? || args.empty?
 
-        @help_formatter.command_map = define_tasks(tasks, @slop)
+        include_pre_tasks
+        remaining = @slop.parse! args.dup
+        remaining.push "--help" if @slop.help?
 
-        remaining = @slop.parse! args
-        raise Hem::InvalidCommandOrOpt.new remaining.join(" "), self if remaining.size > 0
+        if remaining == args
+          include_post_tasks opts
+
+          remaining = @slop.parse! remaining
+        end
+
+        raise Hem::InvalidCommandOrOpt.new remaining.join(" ") if remaining.size > 0
 
         show_help if @slop.help?
       rescue Halt
@@ -80,20 +80,24 @@ module Hem
 
     private
 
+    def include_pre_tasks
+      tasks = structure_tasks Hem::Metadata.metadata.keys
+      pre_tasks = tasks.select { |k,_| @pre_task_namespaces.include? k }
+      @help_formatter.command_map = define_tasks(pre_tasks, @slop)
+    end
+
+    def include_post_tasks opts
+      load_plugins
+      perform_host_checks unless opts[:'skip-host-checks']
+
+      tasks = structure_tasks Hem::Metadata.metadata.keys
+      post_tasks = tasks.reject { |k,_| @pre_task_namespaces.include? k }
+
+      @help_formatter.command_map.merge! define_tasks(post_tasks, @slop)
+    end
+
     def load_builtin_tasks
-      require 'hem/tasks/assets'
-      require 'hem/tasks/config'
-      require 'hem/tasks/deps'
-      require 'hem/tasks/exec'
-      require 'hem/tasks/ops'
-      require 'hem/tasks/pr'
-      require 'hem/tasks/seed'
-      require 'hem/tasks/self'
-      require 'hem/tasks/shell_init'
-      require 'hem/tasks/system'
-      require 'hem/tasks/system/completions'
-      require 'hem/tasks/tools'
-      require 'hem/tasks/vm'
+      require_relative 'tasks'
     end
 
     def load_user_config
@@ -120,6 +124,10 @@ module Hem
       end
     end
 
+    def load_plugins
+      Hem.plugins.setup unless Hem.plugins.setup?
+    end
+
     def perform_host_checks
       checks = [
         'vagrant.*',
@@ -207,7 +215,7 @@ module Hem
 
           description metadata[:desc]
           long_description metadata[:long_desc]
-          arg_list task.arg_names
+          arg_list metadata[:arg_list]
           hidden metadata[:hidden]
           project_only metadata[:project_only]
 
@@ -223,9 +231,8 @@ module Hem
             Dir.chdir Hem.project_path if Hem.in_project?
             raise ::Hem::ProjectOnlyError.new if opts.project_only && !Hem.in_project?
             task.opts = opts.to_hash.merge({:_unparsed => hem.slop.unparsed})
-            raise ::Hem::MissingArgumentsError.new(name, args, hem) if args && task.arg_names.length > args.length
-            task.invoke *args
-            args.pop(task.arg_names.size)
+
+            task.invoke *Helper::convert_args(name, args, metadata[:arg_list])
             task.opts = nil
           end
         end