hobo-inviqa 0.0.7.pre.rc3 → 0.0.7

data/Gemfile.lock

@@ -1,19 +1,16 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.7.pre.rc3)
+    hobo-inviqa (0.0.7)
       aws-sdk (~> 1.34.0)
       bundler (~> 1.5.2)
       deepstruct (~> 0.0.5)
       highline (~> 1.6.20)
-      net-ssh-simple (~> 1.6.3)
-      os (~> 0.9.6)
       rake (~> 10.1.1)
       rake-hooks (~> 1.2.3)
       ruby-progressbar (~> 1.4.1)
       semantic (~> 1.3.0)
       slop (~> 3.4.7)
-      teerb (~> 0.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -22,11 +19,10 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    aws-sdk (1.34.1)
+    aws-sdk (1.34.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    blockenspiel (0.4.5)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
@@ -61,8 +57,7 @@ GEM
     guard-rspec (4.2.6)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    hashie (2.0.5)
-    highline (1.6.21)
+    highline (1.6.20)
     json (1.8.1)
     listen (2.5.0)
       celluloid (>= 0.15.2)
@@ -74,18 +69,9 @@ GEM
     mini_portile (0.5.2)
     multi_json (1.8.4)
     multi_test (0.0.3)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    net-ssh-simple (1.6.3)
-      blockenspiel (~> 0.4.3)
-      hashie (>= 1.1.0)
-      net-scp (~> 1.1.0)
-      net-ssh (~> 2.7.0)
     nio4r (1.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    os (0.9.6)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -105,10 +91,9 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.5)
-    ruby-progressbar (1.4.2)
+    ruby-progressbar (1.4.1)
     semantic (1.3.0)
     slop (3.4.7)
-    teerb (0.0.1)
     thor (0.18.1)
     timers (1.1.0)
     uuidtools (2.1.4)

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
@@ -11,4 +11,4 @@ guard 'cucumber' do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})          { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
-end
+end

data/Hobofile

@@ -31,8 +31,4 @@ namespace :test do
   task 'argument-test', [ :test ] do |task, args|
     Hobo.ui.info args[:test]
   end
-
-  task 'unparsed' do |task|
-    Hobo.ui.info task.opts[:_unparsed]
-  end
-end
+end

data/bin/hobo

@@ -5,21 +5,29 @@ $:.push File.expand_path(File.join("..", "..", "lib"), __FILE__)
 
 require 'hobo'
 require 'slop'
-require 'teerb'
-require 'tmpdir'
 
 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
+# We also take the opportunity to disable ansi for pipes
+Hobo.ui.use_color false if Gem.win_platform? || !STDOUT.tty?
 
 # Options parsed here will be hidden from the main app
 slop = Slop.parse! do
   on '--debug', 'Enable debugging' do
     error_handler = Hobo::ErrorHandlers::Debug.new
-    debug_log = File.open(File.join(Dir.tmpdir, 'hobo_debug.log'), 'w+')
-    Hobo.logger = Logger.new(TeeRb::IODelegate.new(STDOUT, debug_log))
     Hobo.logger.level = Logger::DEBUG
   end
 
@@ -31,16 +39,14 @@ slop = Slop.parse! do
     level = self.to_hash[:'log-level'].upcase
     Hobo.logger.level = Logger.const_get(level) if [ 'DEBUG', 'INFO' ].include? level
   end
-end
 
-Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
-  "#{datetime.strftime("%Y-%m-%d %H:%M:%S")}: #{severity}: #{msg}\n"
+  on '--ansi', 'Enable / disable ansi output' do |*args|
+    Hobo.ui.use_color self.to_hash[:ansi]
+  end
 end
 
 begin
-  Hobo::Lib::HostCheck.check(:filter => /not_using_system_ruby/)
-  Hobo.cli = Hobo::Cli.new(slop: slop)
-  Hobo.cli.start
+  Hobo::Cli.new(slop: slop).start
 rescue Exception => error
   exit error_handler.handle(error)
-end
+end

data/hobo.gemspec

@@ -27,9 +27,6 @@ Gem::Specification.new do |spec|
   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_dependency "teerb", "~> 0.0.1"
-  spec.add_dependency "os", "~> 0.9.6"
-  spec.add_dependency "net-ssh-simple", "~> 1.6.3"
 
   spec.add_development_dependency "aruba", "~> 0.5.4"
   spec.add_development_dependency "rspec", "~> 2.14.1"

data/lib/hobo.rb

@@ -4,7 +4,6 @@ require 'rake/hooks'
 require 'tempfile'
 require 'shellwords'
 require 'deepstruct'
-require 'os'
 
 # DSL enhancements
 require 'hobo/metadata'
@@ -17,11 +16,9 @@ require 'hobo/version'
 require 'hobo/null'
 require 'hobo/paths'
 require 'hobo/errors'
-require 'hobo/logging'
 require 'hobo/ui'
 require 'hobo/util'
 require 'hobo/help_formatter'
-require 'hobo/error_handlers/exit_code_map'
 require 'hobo/error_handlers/debug'
 require 'hobo/error_handlers/friendly'
 require 'hobo/config/file'
@@ -29,14 +26,10 @@ require 'hobo/logging'
 require 'hobo/config'
 require 'hobo/asset_applicator'
 
-# Asset sync
-require 'hobo/lib/s3sync'
-
 # Task helpers
 require 'hobo/helper/shell'
 require 'hobo/helper/file_locator'
 require 'hobo/helper/vm_command'
-require 'hobo/helper/http_download'
 
 # Libs
 require 'hobo/lib/seed/project'
@@ -51,4 +44,4 @@ require 'hobo/lib/host_check/deps'
 require 'hobo/lib/host_check'
 
 # App
-require 'hobo/cli'
+require 'hobo/cli'

data/lib/hobo/cli.rb

@@ -3,10 +3,6 @@ require 'deepstruct'
 
 module Hobo
 
-  class << self
-    attr_accessor :cli
-  end
-
   class Halt < Error
   end
 
@@ -23,7 +19,6 @@ module Hobo
     end
 
     def start args = ARGV
-
       load_user_config
       load_builtin_tasks
       load_hobofiles
@@ -36,9 +31,6 @@ module Hobo
         # Parse out global args first
         @slop.parse! args
         opts = @slop.to_hash
-
-        Hobo::Lib::HostCheck.check(:filter => /vagrant.*|.*present/, :raise => true) unless opts[:'skip-host-checks']
-
         @help_opts[:all] = opts[:all]
         Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
 
@@ -71,11 +63,9 @@ module Hobo
 
     def load_builtin_tasks
       require 'hobo/tasks/assets'
-      require 'hobo/tasks/config'
       require 'hobo/tasks/debug'
       require 'hobo/tasks/deps'
-      require 'hobo/tasks/system'
-      require 'hobo/tasks/system/completions'
+      require 'hobo/tasks/host'
       require 'hobo/tasks/seed'
       require 'hobo/tasks/vm'
       require 'hobo/tasks/tools'
@@ -109,7 +99,6 @@ module Hobo
       slop.on '-a', '--all', 'Show hidden commands'
       slop.on '-h', '--help', 'Display help'
       slop.on '--non-interactive', 'Run non-interactively. Defaults will be automatically used where possible.'
-      slop.on '--skip-host-checks', 'Skip host checks'
 
       slop.on '-v', '--version', 'Print version information' do
         Hobo.ui.info "Hobo version #{Hobo::VERSION}"
@@ -189,7 +178,7 @@ module Hobo
           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.merge({:_unparsed => hobo.slop.unparsed})
+            task.opts = opts.to_hash
             raise ::Hobo::MissingArgumentsError.new(name, args, hobo) if args && task.arg_names.length > args.length
             task.invoke *args
             args.pop(task.arg_names.size)
@@ -215,4 +204,4 @@ module Hobo
       out
     end
   end
-end
+end

data/lib/hobo/error_handlers/debug.rb

@@ -1,12 +1,9 @@
 module Hobo
   module ErrorHandlers
     class Debug
-      include Hobo::ErrorHandlers::ExitCodeMap
-
       def handle error
-        Hobo.ui.error "\n(#{error.class}) #{error.message}\n\n#{(error.backtrace || []).join("\n")}"
-        return EXIT_CODES[error.class.to_s] || DEFAULT_EXIT_CODE
+        raise error
       end
     end
   end
-end
+end

data/lib/hobo/error_handlers/friendly.rb

@@ -3,8 +3,6 @@ require 'tmpdir' # Needed for Dir.tmpdir
 module Hobo
   module ErrorHandlers
     class Friendly
-      include Hobo::ErrorHandlers::ExitCodeMap
-
       def handle error
         log_file = File.join(Dir.tmpdir, 'hobo_error.log')
 
@@ -12,6 +10,7 @@ module Hobo
         case error.class.to_s
           when "Interrupt"
             Hobo.ui.warning "\n\nCaught Interrupt. Aborting\n"
+            return 1
           when "Hobo::ExternalCommandError"
             FileUtils.cp error.output.path, log_file
 
@@ -26,19 +25,21 @@ module Hobo
 
   The output of the command has been logged to #{log_file}
             ERROR
+            return 3
           when "Hobo::InvalidCommandOrOpt"
             Hobo.ui.error "\n#{error.message}"
             Hobo.ui.info error.cli.help_formatter.help if error.cli
+            return 4
           when "Hobo::MissingArgumentsError"
             Hobo.ui.error "\n#{error.message}"
             Hobo.ui.info error.cli.help_formatter.help(target: error.command) if error.cli
+            return 5
           when "Hobo::UserError"
             Hobo.ui.error "\n#{error.message}\n"
+            return 6
           when "Hobo::ProjectOnlyError"
             Hobo.ui.error "\nHobo requires you to be in a project directory for this command!\n"
-          when "Hobo::HostCheckError"
-            Hobo.ui.error "\nHobo has detected a problem with your system configuration:\n"
-            Hobo.ui.warning error.advice.gsub(/^/, '  ')
+            return 7
           else
             File.write(log_file, "(#{error.class}) #{error.message}\n\n#{error.backtrace.join("\n")}")
             Hobo.ui.error <<-ERROR
@@ -48,10 +49,9 @@ module Hobo
 
   The backtrace has been logged to #{log_file}
             ERROR
+            return 128
         end
-
-        return EXIT_CODES[error.class.to_s] || DEFAULT_EXIT_CODE
       end
     end
   end
-end
+end

data/lib/hobo/errors.rb

@@ -1,6 +1,5 @@
 module Hobo
   class Error < StandardError
-    attr_reader :exit_code
   end
 
   class RubyVersionError < Error
@@ -65,13 +64,4 @@ module Hobo
       super("A tool that hobo depends on could not be detected (#{dep})")
     end
   end
-
-  class HostCheckError < Error
-    attr_accessor :summary, :advice
-    def initialize summary, advice
-      @summary = summary
-      @advice = advice
-      super("Host check failed: #{summary}")
-    end
-  end
-end
+end

data/lib/hobo/helper/shell.rb

@@ -39,8 +39,7 @@ module Hobo
         :capture => false,
         :indent => 0,
         :realtime => false,
-        :env => {},
-        :ignore_errors => false
+        :env => {}
       }.merge! opts
 
       Hobo::Logging.logger.debug("helper.shell: Invoking '#{args.join(" ")}' with #{opts.to_s}")
@@ -72,7 +71,7 @@ module Hobo
         buffer.fsync
         buffer.rewind
 
-        raise ::Hobo::ExternalCommandError.new(args.join(" "), external.value.exitstatus, buffer) if external.value.exitstatus != 0 && !opts[:ignore_errors]
+        raise ::Hobo::ExternalCommandError.new(args.join(" "), external.value.exitstatus, buffer) if external.value.exitstatus != 0
 
         return opts[:capture] ? buffer.read.strip : nil
       end

data/lib/hobo/helper/vm_command.rb

@@ -1,26 +1,20 @@
-require 'tempfile'
-require 'net/ssh/simple'
+require 'hobo/helper/shell'
 
 module Hobo
   module Helper
     def vm_shell command, opts = {}
-      shell VmCommand.new(command, opts).to_s, opts
+      shell VmCommand.new(command).to_s, opts
     end
 
     def vm_mysql opts = {}
       opts = {
         :auto_echo => true,
         :db => "",
-        :user => maybe(Hobo.project_config.mysql.username) || "",
-        :pass => maybe(Hobo.project_config.mysql.password) || "",
-        :mysql => 'mysql'
+        :user => maybe(Hobo.project_config.mysql.username) || "root",
+        :pass => maybe(Hobo.project_config.mysql.password) || "root"
       }.merge(opts)
 
-      opts[:user] = "-u#{opts[:user].shellescape}" unless opts[:user].empty?
-      opts[:pass] = "-p#{opts[:pass].shellescape}" unless opts[:pass].empty?
-      opts[:db] = opts[:db].shellescape unless opts[:db].empty?
-
-      VmCommand.new "#{opts[:mysql]} #{opts[:user]} #{opts[:pass]} #{opts[:db]}".strip, opts
+      VmCommand.new "mysql -u#{opts[:user].shellescape} -p#{opts[:pass].shellescape} #{opts[:db].shellescape}", opts
     end
 
     def vm_command command = nil, opts = {}
@@ -29,89 +23,17 @@ module Hobo
 
     private
 
-    class VmInspector
-      attr_accessor :ssh_config, :project_mount_path
-
-      def project_mount_path
-        configured_path = maybe(Hobo.project_config.vm.project_mount_path)
-        return configured_path if configured_path
-        return @project_mount_path if @project_mount_path
-
-        tmp = Tempfile.new('vm_command_locator', Hobo.project_path)
-
-        begin
-          tmp.write(Hobo.project_path)
-
-          locator_file = File.basename(tmp.path)
-
-          pattern = OS.windows? ? 'vboxsf' : Hobo.project_path.shellescape
-
-          sed = 's/.* on \(.*\) type.*/\1\/%%/g'.gsub('%%', locator_file)
-          locator_results = VmCommand.new(
-            "mount | grep #{pattern} | sed -e\"#{sed}\" | xargs md5sum",
-            :capture => true,
-            :pwd => '/'
-          ).run
-        ensure
-          tmp.unlink
-        end
-
-        match = locator_results.match(/^([a-z0-9]{32})\s+(.*)$/)
-
-        raise Exception.new("Unable to locate project mount point in VM") if !match
-
-        @vm_project_mount_path = File.dirname(match[2])
-
-        # Stash it in config
-        Hobo.project_config[:vm] ||= {}
-        Hobo.project_config[:vm][:project_mount_path] = @vm_project_mount_path
-        Hobo::Config::File.save(Hobo.project_config_file, Hobo.project_config)
-
-        return @vm_project_mount_path
-      end
-
-      def ssh_config
-        return @ssh_config if @ssh_config
-        config = nil
-        locate "*Vagrantfile" do
-          config = bundle_shell "vagrant ssh-config", :capture => true
-        end
-
-        raise Exception.new "Could not retrieve VM ssh configuration" unless config
-
-        patterns = {
-          :ssh_user => /^\s*User (.*)$/,
-          :ssh_identity => /^\s*IdentityFile (.*)$/,
-          :ssh_host => /^\s*HostName (.*)$/,
-          :ssh_port => /^\s*Port (\d+)/
-        }
-
-        output = {}
-
-        patterns.each do |k, pattern|
-          match = config.match(pattern)
-          output[k] = match[1] if match
-        end
-
-        return @ssh_config = output
-      end
-    end
-
     class VmCommand
-      class << self
-        attr_accessor :vm_inspector
-        @@vm_inspector = VmInspector.new
-      end
-
       attr_accessor :opts, :command
 
       def initialize command, opts = {}
         @command = command
         @opts = {
           :auto_echo => false,
-          :psuedo_tty => false,
-          :pwd => opts[:pwd] || @@vm_inspector.project_mount_path,
-          :append => ''
+          :psuedo_tty => true,
+          :ssh_identity => "#{ENV['HOME'].shellescape}/.vagrant.d/insecure_private_key",
+          :ssh_user => "vagrant",
+          :ssh_host => maybe(Hobo.project_config.hostname) || ""
         }.merge(opts)
       end
 
@@ -122,84 +44,12 @@ module Hobo
         return self
       end
 
-      def < pipe
-        pipe = "echo '#{pipe.shellescape}'" if opts[:auto_echo]
-        @pipe_in_vm = pipe
-        @opts[:psuedo_tty] = false
-        return self
-      end
-
-      # TODO Refactor in to ssh helper with similar opts to shell helper
-      # TODO Migrate all vm_shell functionality this direction
-      def run
-        return if @command.nil?
-        opts = @@vm_inspector.ssh_config.merge(@opts)
-
-        Net::SSH::Simple.sync do
-          ssh_opts = {
-            :user => opts[:ssh_user],
-            :port => opts[:ssh_port],
-            :forward_agent => true,
-            :global_known_hosts_file => "/dev/null",
-            :paranoid => false,
-            :user_known_hosts_file => "/dev/null"
-          }
-
-          ssh_opts[:keys] = [opts[:ssh_identity]] if opts[:ssh_identity]
-
-          tmp = Tempfile.new "vm_command_exec"
-
-          begin
-            filename = File.basename(tmp.path)
-            remote_file = "/tmp/#{filename}"
-            tmp.write "#{@command}#{opts[:append]}"
-            tmp.close
-
-            scp_put opts[:ssh_host], tmp.path, remote_file, ssh_opts
-            result = ssh opts[:ssh_host], "cd #{opts[:pwd]}; exec /bin/bash #{remote_file}", ssh_opts
-            ssh opts[:ssh_host], "rm #{remote_file}", ssh_opts
-
-            # Throw exception if exit code not 0
-
-            return opts[:capture] ? result.stdout : result.success
-          ensure
-            tmp.unlink
-          end
-        end
-      end
-
-      # TODO Speed up Vagrant SSH connections
-      # May need to be disabled for windows (mm_send_fd: UsePrivilegeSeparation=yes not supported)
-      # https://gist.github.com/jedi4ever/5657094
-
       def to_s
-        opts = @@vm_inspector.ssh_config.merge(@opts)
-
-        psuedo_tty = opts[:psuedo_tty] ? "-t" : ""
-
-        ssh_command = [
-          "ssh",
-          "-o 'UserKnownHostsFile /dev/null'",
-          "-o 'StrictHostKeyChecking no'",
-          "-o 'ForwardAgent yes'",
-          "-o 'LogLevel FATAL'",
-          "-p #{opts[:ssh_port]}",
-          "-i #{opts[:ssh_identity].shellescape}",
-          psuedo_tty,
-          "#{opts[:ssh_user].shellescape}@#{opts[:ssh_host].shellescape}"
-        ].join(" ")
-
-        pwd_set_command = " -- \"cd #{@opts[:pwd].shellescape}; exec /bin/bash"
-
-        vm_command = [
-          @pipe_in_vm,
-          @command
-        ].compact.join(" | ")
-
+        psuedo_tty = @opts[:psuedo_tty] ? "-t" : ""
         command = [
-          ssh_command + pwd_set_command,
-          vm_command.empty? ? nil : vm_command.shellescape
-        ].compact.join(" -c ") + "#{opts[:append].shellescape}\""
+          "ssh -i #{opts[:ssh_identity]} #{psuedo_tty} #{opts[:ssh_user].shellescape}@#{opts[:ssh_host].shellescape}",
+          @command
+        ].compact.join(" -- ")
 
         [
           @pipe,
@@ -214,4 +64,4 @@ module Hobo
   end
 end
 
-include Hobo::Helper
+include Hobo::Helper