hobo-inviqa 0.0.4 → 0.0.6

data/Gemfile.lock

@@ -1,11 +1,15 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.4)
+    hobo-inviqa (0.0.6)
+      aws-sdk (~> 1.34.0)
       bundler (~> 1.5.2)
+      deepstruct (~> 0.0.5)
       highline (~> 1.6.20)
       rake (~> 10.1.1)
       rake-hooks (~> 1.2.3)
+      ruby-progressbar (~> 1.4.1)
+      semantic (~> 1.3.0)
       slop (~> 3.4.7)
 
 GEM
@@ -15,10 +19,17 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
+    aws-sdk (1.34.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.4.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     cucumber (1.3.10)
@@ -27,6 +38,7 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
+    deepstruct (0.0.5)
     diff-lcs (1.2.5)
     fakefs (0.5.0)
     ffi (1.9.3)
@@ -42,18 +54,24 @@ GEM
     guard-cucumber (1.4.1)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (4.2.5)
+    guard-rspec (4.2.6)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     highline (1.6.20)
-    listen (2.4.0)
+    json (1.8.1)
+    listen (2.5.0)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
     method_source (0.8.2)
+    mini_portile (0.5.2)
     multi_json (1.8.4)
     multi_test (0.0.3)
+    nio4r (1.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -70,12 +88,15 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.5)
+    ruby-progressbar (1.4.1)
+    semantic (1.3.0)
     slop (3.4.7)
     thor (0.18.1)
     timers (1.1.0)
+    uuidtools (2.1.4)
 
 PLATFORMS
   ruby

data/README.md

@@ -50,16 +50,7 @@ hobo my-project download-files
 ```
 
 # Rake DSL enhancements
-This section is yet to be written; please see lib/hobo/patches/rake.rb and the internal tasks (for usage) under lib/hobo/tasks for the time being.
-
-- long_desc - Long description provided by help
-- option - Specify command line option
-- hidden - Hide task
-- replace - Replace a task with a new one
-- before - Execute task before other task
-- after - Execute task after other task
-
-Please note that replace, before and after should be used sparingly to augment or modify the internal tasks provided by hobo on a per project level.
+Please see https://github.com/inviqa/hobo-gem/wiki/Hobofile-DSL for comprehensive examples.
 
 # Contributing
 If you wish to contribute to hobo:

data/bin/hobo

@@ -8,6 +8,16 @@ require 'slop'
 
 error_handler = Hobo::ErrorHandlers::Friendly.new
 Hobo.ui = Hobo::Ui.new
+Hobo.logger = Logger.new(STDOUT)
+Hobo.logger.level = Logger::WARN
+Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
+  "#{datetime.strftime("%Y-%m-%d %H:%M:%S")}: #{severity}: #{msg}\n"
+end
+
+# win32console unfortunately has issues with Open3
+# Simply disabling color for now; --ansi can be explicitly passed if required
+# We also take the opportunity to disable ansi for pipes
+Hobo.ui.use_color false if Gem.win_platform? || !STDOUT.tty?
 
 # win32console unfortunately has issues with Open3
 # Simply disabling color for now; --ansi can be explicitly passed if required
@@ -18,6 +28,16 @@ Hobo.ui.use_color false if Gem.win_platform? || !STDOUT.tty?
 slop = Slop.parse! do
   on '--debug', 'Enable debugging' do
     error_handler = Hobo::ErrorHandlers::Debug.new
+    Hobo.logger.level = Logger::DEBUG
+  end
+
+  on '--ansi', 'Enable / disable ansi output', :invertable => true do
+    Hobo.ui.use_color self.to_hash[:ansi]
+  end
+
+  on '--log-level=', 'Set log level' do
+    level = self.to_hash[:'log-level'].upcase
+    Hobo.logger.level = Logger.const_get(level) if [ 'DEBUG', 'INFO' ].include? level
   end
 
   on '--ansi', 'Enable / disable ansi output' do |*args|

data/features/hobo/help.feature

@@ -9,4 +9,8 @@ Feature: Hobo help
     When I run `hobo --help`
     Then the output should contain "Usage:"
     And the output should contain "Global options:"
-    And the output should contain "Commands:"
+    And the output should contain "Commands:"
+
+  Scenario: --ansi should show invertable help
+    When I run `hobo --help`
+    Then the output should contain "(Disable with --no-ansi)"

data/hobo.gemspec

@@ -23,6 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rake", "~> 10.1.1"
   spec.add_dependency "rake-hooks", "~> 1.2.3"
   spec.add_dependency "bundler", "~> 1.5.2"
+  spec.add_dependency "deepstruct", "~> 0.0.5"
+  spec.add_dependency "semantic", "~> 1.3.0"
+  spec.add_dependency "aws-sdk", "~> 1.34.0"
+  spec.add_dependency "ruby-progressbar", "~> 1.4.1"
 
   spec.add_development_dependency "aruba", "~> 0.5.4"
   spec.add_development_dependency "rspec", "~> 2.14.1"

data/lib/hobo.rb

@@ -1,24 +1,19 @@
 # External deps
 require 'rake'
 require 'rake/hooks'
-require 'slop'
-require 'highline'
-require 'open3'
 require 'tempfile'
 require 'shellwords'
-require 'find'
+require 'deepstruct'
 
 # DSL enhancements
 require 'hobo/metadata'
 require 'hobo/patches/rake'
 require 'hobo/patches/slop'
-
-# Task helpers
-require 'hobo/helper/shell'
-require 'hobo/helper/file_locator'
+require 'hobo/patches/deepstruct'
 
 # Basics
 require 'hobo/version'
+require 'hobo/null'
 require 'hobo/paths'
 require 'hobo/errors'
 require 'hobo/ui'
@@ -27,18 +22,26 @@ require 'hobo/help_formatter'
 require 'hobo/error_handlers/debug'
 require 'hobo/error_handlers/friendly'
 require 'hobo/config/file'
+require 'hobo/logging'
+require 'hobo/config'
+require 'hobo/asset_applicator'
+
+# Task helpers
+require 'hobo/helper/shell'
+require 'hobo/helper/file_locator'
+require 'hobo/helper/vm_command'
 
 # Libs
 require 'hobo/lib/seed/project'
 require 'hobo/lib/seed/replacer'
 require 'hobo/lib/seed/seed'
 
-# Built-in tasks
-require 'hobo/tasks/debug'
-require 'hobo/tasks/deps'
-require 'hobo/tasks/seed'
-require 'hobo/tasks/vm'
-require 'hobo/tasks/tools'
+# Host checks
+require 'hobo/lib/host_check/git'
+require 'hobo/lib/host_check/vagrant'
+require 'hobo/lib/host_check/ruby'
+require 'hobo/lib/host_check/deps'
+require 'hobo/lib/host_check'
 
 # App
 require 'hobo/cli'

data/lib/hobo/asset_applicator.rb

@@ -0,0 +1,16 @@
+module Hobo
+  class << self
+    attr_accessor :asset_applicators
+    def asset_applicators
+      @asset_applicators ||= AssetApplicatorRegistry.new
+    end
+  end
+
+  private
+
+  class AssetApplicatorRegistry < Hash
+    def register pattern, &block
+      self[pattern] = block
+    end
+  end
+end

data/lib/hobo/cli.rb

@@ -1,9 +1,14 @@
+require 'slop'
+require 'deepstruct'
+
 module Hobo
 
   class Halt < Error
   end
 
   class Cli
+    include Hobo::Logging
+
     attr_accessor :slop, :help_formatter
 
     def initialize opts = {}
@@ -13,11 +18,13 @@ module Hobo
       @help_opts = {}
     end
 
-    def start argv = ARGV
-      load_hobofile
+    def start args = ARGV
+      load_user_config
+      load_builtin_tasks
+      load_hobofiles
+      load_project_config
 
       tasks = structure_tasks Hobo::Metadata.metadata.keys
-      args = fix_args_with_equals argv
       define_global_opts @slop
 
       begin
@@ -54,13 +61,38 @@ module Hobo
 
     private
 
-    def load_hobofile
+    def load_builtin_tasks
+      require 'hobo/tasks/assets'
+      require 'hobo/tasks/console'
+      require 'hobo/tasks/debug'
+      require 'hobo/tasks/deps'
+      require 'hobo/tasks/host'
+      require 'hobo/tasks/seed'
+      require 'hobo/tasks/vm'
+      require 'hobo/tasks/tools'
+    end
+
+    def load_user_config
+      Hobo.user_config = Hobo::Config::File.load Hobo.user_config_file
+    end
+
+    def load_project_config
+      if Hobo.in_project?
+        Hobo.project_config = Hobo::Config::File.load Hobo.project_config_file
+      else
+        Hobo.project_config = DeepStruct.wrap({})
+      end
+    end
+
+    def load_hobofiles
       if Hobo.in_project? && File.exists?(Hobo.hobofile_path)
-        load Hobo.hobofile_path
+        logger.debug("cli: Loading hobofile @ #{Hobo.hobofile_path}")
+        TOPLEVEL_BINDING.eval File.read(Hobo.hobofile_path)
       end
 
       if File.exists?(Hobo.user_hobofile_path)
-        load Hobo.user_hobofile_path
+        logger.debug("cli: Loading hobofile @ #{Hobo.user_hobofile_path}")
+        TOPLEVEL_BINDING.eval File.read(Hobo.user_hobofile_path)
       end
     end
 
@@ -83,6 +115,7 @@ module Hobo
       structured_list.each do |k, v|
         name = (stack + [k]).join(':')
         new_stack = stack + [k]
+        logger.debug("cli: Defined #{name}")
         map[name] = if v.size == 0
           define_command(name, scope, new_stack)
         else
@@ -144,6 +177,7 @@ module Hobo
           end
 
           run do |opts, args|
+            Dir.chdir Hobo.project_path if Hobo.in_project?
             raise ::Hobo::ProjectOnlyError.new if opts.project_only && !Hobo.in_project?
             task.opts = opts.to_hash
             raise ::Hobo::MissingArgumentsError.new(name, args, hobo) if args && task.arg_names.length > args.length
@@ -170,19 +204,5 @@ module Hobo
       end
       out
     end
-
-    # Slop badly handles assignment args passed as --arg=val
-    # This hack fixes that by making them --arg val
-    def fix_args_with_equals args
-      items = []
-      args.each do |item|
-        if item.match /^-.*\=/
-          item.split('=').each { |i| items.push i }
-        else
-          items.push item
-        end
-      end
-      return items
-    end
   end
 end

data/lib/hobo/config.rb

@@ -0,0 +1,5 @@
+module Hobo
+  class << self
+    attr_accessor :project_config, :user_config
+  end
+end

data/lib/hobo/config/file.rb

@@ -1,9 +1,11 @@
 require 'yaml'
+require 'deepstruct'
 
 module Hobo
   module Config
     class File
       def self.save(file, config)
+        config = config.unwrap if config.respond_to? :unwrap
         dir = ::File.dirname file
         FileUtils.mkdir_p dir unless ::File.exists? dir
         ::File.open(file, 'w+') do |f|
@@ -14,7 +16,7 @@ module Hobo
       def self.load(file)
         config = ::File.exists?(file) ? YAML.load_file(file) : {}
         raise "Invalid hobo configuration (#{file})" unless config
-        return config
+        return DeepStruct.wrap(config)
       end
     end
   end

data/lib/hobo/errors.rb

@@ -54,7 +54,14 @@ module Hobo
   class NonInteractiveError < Error
     def initialize question
       @question = question
-      super("A task requested input from user but hobo is in non-interactive mode")
+      super("A task requested input from the user but hobo is in non-interactive mode")
+    end
+  end
+
+  class MissingDependency < Error
+    def initialize dep
+      @dependency = dep
+      super("A tool that hobo depends on could not be detected (#{dep})")
     end
   end
 end

data/lib/hobo/help_formatter.rb

@@ -1,3 +1,8 @@
+require 'slop'
+require 'highline'
+require 'hobo/ui'
+require 'hobo/patches/slop'
+
 module Hobo
   class HelpFormatter
     attr_accessor :command_map
@@ -60,8 +65,10 @@ module Hobo
       (heads + tails).map do |opt|
         next if source != @global && opt.short == 'h'
         line = padded(opt.short ? "-#{opt.short}," : "", 4)
+        description = opt.description
 
         if opt.long
+          description += ". (Disable with --no-#{opt.long})" if opt.config[:invertable]
           value = opt.config[:argument] ? "#{opt.long.upcase}" : ""
           value = "[#{value}]" if opt.accepts_optional_argument?
           value = "=#{value}" unless value.empty?
@@ -69,7 +76,7 @@ module Hobo
           line += "--#{opt.long}#{value}"
         end
 
-        [Hobo.ui.color(line, :opt), opt.description]
+        [Hobo.ui.color(line, :opt), description]
       end.compact
     end
 

data/lib/hobo/helper/file_locator.rb

@@ -22,16 +22,19 @@ module Hobo
       args = [ 'git', 'ls-files', pattern ]
       args.push '-o' if others
       output = Hobo::Helper.shell *args, :capture => true
-      path = output.split("\n")[0]
-
-      unless path.nil?
+      paths = output.split("\n")
+      found = false
+      paths.each do |path|
         path.strip!
         Dir.chdir File.dirname(path) do
-          yield path
+          Hobo::Logging.logger.debug "helper.locator: Found #{path} for #{pattern}"
+          yield File.basename(path), path
         end
 
-        return true
+        found = true
       end
+
+      return found
     end
   end
 end