hobo-inviqa 0.0.7 → 0.0.8

data/lib/hobo/tasks/config.rb

@@ -0,0 +1,15 @@
+desc "Configure hobo"
+task :config do
+  config = Hobo.user_config
+
+  # Not required at present
+  # config.full_name = Hobo.ui.ask("Full name", :default => config.full_name).to_s
+  # config.email = Hobo.ui.ask("Email", :default => config.email).to_s
+
+  config[:aws] ||= {}
+  config.aws.access_key_id = Hobo.ui.ask("AWS access key ID", :default => config.aws.access_key_id).to_s
+  config.aws.secret_access_key = Hobo.ui.ask("AWS secret access key", :default => config.aws.secret_access_key).to_s
+
+  Hobo::Config::File.save(Hobo.user_config_file, config)
+  File.chmod(0600, Hobo.user_config_file)
+end

data/lib/hobo/tasks/deps.rb

@@ -21,10 +21,30 @@ namespace :deps do
       Rake::Task["tools:composer"].invoke
       Hobo.ui.title "Installing composer dependencies"
       Dir.chdir Hobo.project_path do
-        shell "php", File.join(Hobo.project_bin_path, 'composer.phar'), "install", "--ansi", realtime: true, indent: 2
+        ansi = Hobo.ui.supports_color? ? '--ansi' : ''
+        args = [ "php bin/composer.phar install #{ansi} --prefer-dist", { realtime: true, indent: 2 } ]
+        complete = false
+
+        check = Hobo::Lib::HostCheck.check(:filter => /php_present/)
+
+        if check["Php present"] == :ok
+          begin
+            shell *args
+            complete = true
+          rescue Hobo::ExternalCommandError
+            Hobo.ui.warning "Installing composer dependencies locally failed!"
+          end
+        end
+
+        if !complete
+          vm_shell *args
+        end
+
+        Hobo.ui.success "Composer dependencies installed"
       end
+
+      Hobo.ui.separator
     end
-    Hobo.ui.separator
   end
 
   desc "Install vagrant plugins"
@@ -32,9 +52,11 @@ namespace :deps do
     plugins = shell "vagrant plugin list", :capture => true
     locate "*Vagrantfile" do
       File.read("Vagrantfile").split("\n").each do |line|
+        next if line.match /^\s*#/
         next unless line.match /Vagrant\.require_plugin (.*)/
         plugin = $1.gsub(/['"]*/, '')
         next if plugins.include? "#{plugin} "
+
         Hobo.ui.title "Installing vagrant plugin: #{plugin}"
         bundle_shell "vagrant", "plugin", "install", plugin, :realtime => true, :indent => 2
         Hobo.ui.separator
@@ -45,13 +67,22 @@ namespace :deps do
   desc "Install chef dependencies"
   task :chef => [ "deps:gems" ] do
     locate "*Cheffile" do
-      Hobo.ui.title "Installing chef dependencies"
+      Hobo.ui.title "Installing chef dependencies via librarian"
       Bundler.with_clean_env do
-        bundle_shell "librarian-chef", "install", "--verbose", realtime: true, indent: 2 do |line|
-          line =~ /Installing.*</ ? line : nil
+        bundle_shell "librarian-chef", "install", "--verbose", :realtime => true, :indent => 2 do |line|
+          line =~ /Installing.*</ ? line.strip + "\n" : nil
         end
       end
       Hobo.ui.separator
     end
+
+    locate "*Berksfile" do
+      Hobo.ui.title "Installing chef dependencies via berkshelf"
+      Bundler.with_clean_env do
+        bundle_shell "berks", "install", :realtime => true, :indent => 2
+        bundle_shell "berks", "install", "--path", "cookbooks"
+      end
+      Hobo.ui.separator
+    end
   end
-end
+end

data/lib/hobo/tasks/system.rb

@@ -0,0 +1,15 @@
+desc "System configuration related commands"
+namespace :system do
+
+  desc "Check system configuration for potential problems"
+  task :check do
+    Hobo::Lib::HostCheck.check.each do |k,v|
+      if v == :ok
+        Hobo.ui.success "#{k}: OK"
+      else
+        Hobo.ui.error "#{k}: FAILED\n"
+        Hobo.ui.warning v.advice.gsub(/^/, '  ')
+      end
+    end
+  end
+end

data/lib/hobo/tasks/system/completions.rb

@@ -0,0 +1,76 @@
+desc "System configuration related commands"
+namespace :system do
+
+  desc "Shell completion related commands"
+  namespace :completions do
+
+    desc "Install shell completion helpers"
+    option '-f', '--fish', 'Install completions for FISH'
+    option '-b', '--bash', 'Install completions for Bash'
+    option '-z', '--zsh', 'Install completions for ZSH'
+    task "install" do |task|
+      if task.opts[:fish]
+        script = <<-EOF
+function __hobo_completion -d "Create hobo completions"
+  set -l cache_dir "/tmp/fish_hobo_completion_cache"
+  mkdir -p $cache_dir
+  set -l hashed_pwd (ruby -r 'digest' -e 'puts Digest::MD5.hexdigest(`pwd`)')
+  set -l hobo_cache_file "$cache_dir/$hashed_pwd"
+
+  if not test -f "$hobo_cache_file"
+    hobo system completions fish > "$hobo_cache_file"
+  end
+
+  cat "$hobo_cache_file"
+end
+
+function __hobo_scope_test -d "Hobo scoped completion test"
+  set cmd (commandline -opc)
+  if [ "$cmd" = "$argv" ]
+    return 0
+  end
+  return 1
+end
+
+eval (__hobo_completion)
+EOF
+        target = File.join(ENV['HOME'], '.config/fish/completions/hobo.fish')
+        FileUtils.mkdir_p(File.dirname(target))
+        File.write(target, script)
+      end
+
+      if task.opts[:bash]
+        raise "Bash completions not yet implemented"
+      end
+
+      if task.opts[:zsh]
+        raise "ZSH completions not yet implemented"
+      end
+    end
+
+    desc "Display FISH shell completion commands"
+    task :fish do
+      Hobo.cli.slop.options.each do |option|
+        short = option.short.nil? ? '' : "-s #{option.short}"
+        long = option.long.nil? ? '' : "-l #{option.long}"
+        arg = option.config[:argument] ? '' : '-x'
+        puts "complete #{arg} -c hobo #{short} #{long} --description '#{option.description}';"
+      end
+
+      map = Hobo.cli.help_formatter.command_map
+      map.each do |k, v|
+        next if v.description.nil? || v.description.empty?
+        k = k.split(':')
+        k.unshift 'hobo'
+        c = k.pop
+        puts "complete -x -c hobo -n '__hobo_scope_test #{k.join(' ')}' -a #{c} --description '#{v.description}';"
+        v.options.each do |option|
+          short = option.short.nil? ? '' : "-s #{option.short}"
+          long = option.long.nil? ? '' : "-l #{option.long}"
+          arg = option.config[:argument] ? '' : '-x'
+          puts "complete #{arg} -c hobo -n '__hobo_scope_test #{k.concat([c]).join(' ')}' #{short} #{long} --description '#{option.description}';"
+        end
+      end
+    end
+  end
+end

data/lib/hobo/tasks/tools.rb

@@ -1,13 +1,17 @@
+desc "Tasks to retrieve common tools"
+hidden
 namespace :tools do
+
+  desc "Fetch composer"
   task :composer do
     bin_file = File.join(Hobo.project_bin_path, "composer.phar")
     unless File.exists?(bin_file)
-      Hobo.ui.success "Getting composer.phar"
+      Hobo.ui.success "Getting composer"
       FileUtils.mkdir_p File.dirname(bin_file)
-      Dir.chdir File.dirname(bin_file) do
-        shell "php", "-r", "eval('?>'.file_get_contents('https://getcomposer.org/installer'));", realtime: true, indent: 2
-      end
-      Hobo.ui.separator
+      vm_shell "cd bin && php -r \"readfile('https://getcomposer.org/installer');\" | php", :realtime => true, :indent => 2
+    else
+      Hobo.ui.success "Composer already available in bin/composer.phar"
     end
+    Hobo.ui.separator
   end
-end
+end

data/lib/hobo/tasks/vm.rb

@@ -7,14 +7,43 @@ namespace :vm do
     end
   end
 
+  def vagrant_exec *args
+    opts = { :realtime => true, :indent => 2 }
+    color = Hobo.ui.supports_color? ? '--color' : '--no-color'
+
+    if OS.windows?
+      opts[:env] = { 'VAGRANT_HOME' => windows_short(dir) } if ENV['HOME'].match(/\s+/) && !ENV['VAGRANT_HOME']
+    end
+
+    args.unshift 'vagrant'
+    args.push color
+    args.push opts
+
+    bundle_shell *args
+  end
+
+  def windows_short dir
+    segments = dir.gsub(/\\/, '/').split('/')
+    segments.map do |segment|
+      if segment.match /\s+/
+        # This may fail in some edge cases but better than naught
+        # See the following link for the correct solution
+        # http://stackoverflow.com/questions/10224572/convert-long-filename-to-short-filename-8-3
+        segment.upcase.gsub(/\s+/, '')[0...6] + '~1'
+      else
+        segment
+      end
+    end.join('/')
+  end
+
   desc "Start & provision VM"
-  task :up => [ 'deps:chef', 'deps:composer', 'assets:download', 'vm:start', 'vm:provision', 'assets:apply' ]
+  task :up => [ 'deps:chef', 'assets:download', 'vm:start', 'vm:provision', 'deps:composer', 'assets:apply' ]
 
   desc "Stop VM"
   task :stop => [ "deps:gems" ] do
     vagrantfile do
       Hobo.ui.title "Stopping VM"
-      bundle_shell "vagrant", "suspend", "--color", realtime: true, indent: 2
+      vagrant_exec 'suspend'
       Hobo.ui.separator
     end
   end
@@ -26,7 +55,7 @@ namespace :vm do
   task :destroy => [ "deps:gems" ] do
     vagrantfile do
       Hobo.ui.title "Destroying VM"
-      bundle_shell "vagrant", "destroy", "--force", "--color", realtime: true, indent: 2
+      vagrant_exec 'destroy', '--force'
       Hobo.ui.separator
     end
   end
@@ -35,7 +64,7 @@ namespace :vm do
   task :start => [ "deps:gems", "deps:vagrant_plugins" ] do
     vagrantfile do
       Hobo.ui.title "Starting vagrant VM"
-      bundle_shell "vagrant", "up", "--no-provision", "--color", realtime: true, indent: 2
+      vagrant_exec 'up', '--no-provision'
       Hobo.ui.separator
     end
   end
@@ -44,23 +73,47 @@ namespace :vm do
   task :provision => [ "deps:gems" ] do
      vagrantfile do
       Hobo.ui.title "Provisioning VM"
-      bundle_shell "vagrant", "provision", "--color", realtime: true, indent: 2
+      vagrant_exec 'provision'
       Hobo.ui.separator
     end
   end
 
   desc "Open an SSH connection"
-  task :ssh do
-    exec vm_command
+  task :ssh do |task|
+    execute = task.opts[:_unparsed]
+    opts = { :psuedo_tty => STDIN.tty? }
+
+    Hobo.ui.success "Determining VM connection details..." if STDOUT.tty?
+    command = execute.empty? ? vm_command(nil, opts) : vm_command(execute, opts)
+    Hobo.logger.debug "vm:ssh: #{command}"
+
+    Hobo.ui.success "Connecting..." if STDOUT.tty?
+    exec command
   end
 
   desc "Open a MySQL cli connection"
-  task :mysql do
-    exec vm_mysql
+  option '-D=', '--db=', 'Database'
+  task :mysql do |task|
+    opts = { :psuedo_tty => STDIN.tty? }
+    opts[:db] = task.opts[:db] if task.opts[:db]
+
+    Hobo.ui.success "Determining VM connection details..." if STDOUT.tty?
+    command = vm_mysql(opts)
+    Hobo.logger.debug "vm:mysql: #{command}"
+
+    Hobo.ui.success "Connecting..." if STDOUT.tty?
+    exec command
   end
 
   desc "Open a Redis cli connection"
   task :redis do
-    exec vm_command "redis-cli"
+    opts = { :psuedo_tty => STDIN.tty? }
+
+    Hobo.ui.success "Determining VM connection details..." if STDOUT.tty?
+    command = vm_command("redis-cli", opts)
+    Hobo.logger.debug "vm:redis: #{command}"
+
+    Hobo.ui.success "Connecting..." if STDOUT.tty?
+    exec command
   end
-end
+end

data/lib/hobo/ui.rb

@@ -6,6 +6,8 @@ module Hobo
   end
 
   class Ui
+    include Hobo::Logging
+
     attr_accessor :interactive
 
     COLORS = {
@@ -22,10 +24,12 @@ module Hobo
       :description => [:bold]
     }
 
-    def initialize out = $stdout, error = $stderr
+    def initialize input = $stdin, output = $stdout, error = $stderr
       HighLine.color_scheme = HighLine::ColorScheme.new COLORS
-      @out = ::HighLine.new $stdin, out
-      @error = ::HighLine.new $stdin, error
+      @output_io = output
+      @out = ::HighLine.new input, output
+      @error = ::HighLine.new input, error
+      use_color supports_color?
     end
 
     def color_scheme scheme = nil
@@ -33,15 +37,25 @@ module Hobo
       HighLine.color_scheme
     end
 
+    def supports_color?
+      return @output_io.tty? unless OS.windows?
+      return (ENV['ANSICON'] || ENV['TERM'] == 'xterm') && @output_io.tty? # ANSICON or MinTTY && output is TTY
+    end
+
     def use_color opt = nil
       HighLine.use_color = opt unless opt.nil?
       HighLine.use_color?
     end
 
     def ask question, opts = {}
-      unless Hobo.ui.interactive
-        raise Hobo::NonInteractive.new(question) if opts[:default].nil?
-        return opts[:default]
+      opts = {
+        :validate => nil,
+        :default => nil
+      }.merge(opts)
+
+      unless @interactive
+        raise Hobo::NonInteractiveError.new(question) if opts[:default].nil?
+        return opts[:default].to_s
       end
 
       question = "#{question} [#{opts[:default]}]" if opts[:default]
@@ -51,7 +65,8 @@ module Hobo
           q.validate = opts[:validate] if opts[:validate]
           q.readline
         end
-        answer.strip.empty? ? opts[:default] : answer.strip
+        answer = answer.to_s
+        answer.strip.empty? ? opts[:default].to_s : answer.strip
       rescue EOFError
         Hobo.ui.info ""
         ""
@@ -65,7 +80,7 @@ module Hobo
     end
 
     def separator
-      info ""
+      info(supports_color? ? "" : "\n")
     end
 
     def color *args
@@ -100,7 +115,9 @@ module Hobo
 
     def say channel, message, color
       return if message.nil?
-      channel.say(color ? channel.color(message, color) : message)
+      message = color ? channel.color(message, color) : message
+      channel.say(message) unless logger.level <= Logger::DEBUG
+      logger.debug(message)
     end
   end
-end
+end

data/lib/hobo/util.rb

@@ -1,7 +1,41 @@
+require 'ruby-progressbar'
+
 module Hobo
   class << self
+
+    attr_accessor :project_bar_cache
+
     def in_project?
-      !Hobo.project_path.nil?
+      !!Hobo.project_path
+    end
+
+    def progress file, increment, total, type, opts = {}
+      opts = {
+        :title => File.basename(file),
+        :total => total,
+        :format => "%t [%B] %p%% %e"
+      }.merge(opts)
+
+      # Hack to stop newline spam on windows
+      opts[:length] = 79 if Gem::win_platform?
+
+      @progress_bar_cache ||= {}
+
+      if type == :reset
+        type = :update
+        @progress_bar_cache.delete file
+      end
+
+      @progress_bar_cache[file] ||= ProgressBar.create(opts)
+
+      case type
+        when :update
+          @progress_bar_cache[file].progress += increment
+        when :finished
+          @progress_bar_cache[file].finish
+      end
+
+      return @progress_bar_cache[file]
     end
   end
-end
+end