hobo-inviqa 0.0.7.pre.rc3 → 0.0.7

data/lib/hobo/patches/slop.rb

@@ -1,7 +1,7 @@
 require 'slop'
 
 class Slop
-  attr_accessor :long_desc, :arg_list, :hidden, :desc, :unparsed
+  attr_accessor :long_desc, :arg_list, :hidden, :desc
 
   # Slop has a description method but it uses @config which is inherited
   # This is not desired behaviour
@@ -29,23 +29,4 @@ class Slop
     @config[:project_only] = value unless value.nil?
     @config[:project_only]
   end
-
-  alias :old_parse! :parse!
-  def parse!(items = ARGV, &block)
-    if @unparsed.nil?
-      split_index = items.index('--')
-
-      unparsed = []
-      unless split_index.nil?
-        unparsed = items.slice(split_index + 1, items.length)
-        items = items.slice(0, split_index)
-      end
-
-      @unparsed = unparsed.map do |c|
-        "\'#{c.gsub("'", '\\\'').gsub('(', '\\(').gsub(')', '\\)')}\'"
-      end.join(' ')
-    end
-
-    old_parse!(items, &block)
-  end
-end
+end

data/lib/hobo/tasks/assets.rb

@@ -10,8 +10,7 @@ namespace :assets do
     rescue AWS::S3::Errors::NoSuchBucket
       Hobo.ui.error "  Asset bucket #{Hobo.project_config.asset_bucket} does not exist!"
     rescue AWS::Errors::MissingCredentialsError
-      Hobo.ui.warning "  AWS credentials not set!"
-      Hobo.ui.warning "  Either set the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY env vars or run `hobo config` to set them."
+      Hobo.ui.error "  AWS credentials not set!\n\nRun `hobo host config` to set them."
     end
   end
 
@@ -25,8 +24,8 @@ namespace :assets do
       s3_uri = "s3://#{Hobo.project_config.asset_bucket}/#{env}/"
 
       sync = Hobo::Lib::S3Sync.new(
-        maybe(Hobo.user_config.aws.access_key_id) || ENV['AWS_ACCESS_KEY_ID'],
-        maybe(Hobo.user_config.aws.secret_access_key) || ENV['AWS_SECRET_ACCESS_KEY']
+        maybe(Hobo.user_config.aws.access_key_id),
+        maybe(Hobo.user_config.aws.secret_access_key)
       )
 
       handle_s3_error do
@@ -50,8 +49,8 @@ namespace :assets do
       s3_uri = "s3://#{Hobo.project_config.asset_bucket}/#{env}/"
 
       sync = Hobo::Lib::S3Sync.new(
-        maybe(Hobo.user_config.aws.access_key_id) || ENV['AWS_ACCESS_KEY_ID'],
-        maybe(Hobo.user_config.aws.secret_access_key) || ENV['AWS_SECRET_ACCESS_KEY']
+        maybe(Hobo.user_config.aws.access_key_id),
+        maybe(Hobo.user_config.aws.secret_access_key)
       )
 
       handle_s3_error do
@@ -88,7 +87,9 @@ end
 # Built in applicators
 Hobo.asset_applicators.register /.*\.files\.(tgz|tar\.gz|tar\.bz2)/ do |file|
   Hobo.ui.title "Applying file dump (#{file})"
-  vm_shell "tar -xvf #{file.shellescape}"
+  Dir.chdir Hobo.project_path do
+    shell "tar -xvf #{file.shellescape}"
+  end
 end
 
 Hobo.asset_applicators.register /.*\.sql\.gz/ do |file|
@@ -96,13 +97,15 @@ Hobo.asset_applicators.register /.*\.sql\.gz/ do |file|
   db = File.basename(matches[1])
 
   begin
-    shell(vm_mysql(:mysql => 'mysqladmin', :append => " create #{db.shellescape}"))
-  rescue Hobo::ExternalCommandError => e
+    shell(vm_mysql << "USE #{db}")
     Hobo.ui.warning "Already applied (#{file})"
-    raise e if e.exit_code != 1
     next
+  rescue Hobo::ExternalCommandError => e
+    raise e if e.exit_code != 1
   end
 
   Hobo.ui.title "Applying mysqldump (#{file})"
-  shell(vm_mysql(:auto_echo => false, :db => db) < "zcat #{file.shellescape}")
-end
+
+  shell(vm_mysql << "CREATE DATABASE #{db}")
+  shell(vm_mysql(:auto_echo => false, :db => db) << "zcat #{file.shellescape}")
+end

data/lib/hobo/tasks/deps.rb

@@ -21,30 +21,10 @@ namespace :deps do
       Rake::Task["tools:composer"].invoke
       Hobo.ui.title "Installing composer dependencies"
       Dir.chdir Hobo.project_path do
-        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"
+        shell "php", File.join(Hobo.project_bin_path, 'composer.phar'), "install", "--ansi", realtime: true, indent: 2
       end
-
-      Hobo.ui.separator
     end
+    Hobo.ui.separator
   end
 
   desc "Install vagrant plugins"
@@ -52,15 +32,10 @@ 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}"
-        if plugin == 'vagrant-berkshelf'
-          # Hack to install minitar
-        end
         bundle_shell "vagrant", "plugin", "install", plugin, :realtime => true, :indent => 2
         Hobo.ui.separator
       end
@@ -70,22 +45,13 @@ namespace :deps do
   desc "Install chef dependencies"
   task :chef => [ "deps:gems" ] do
     locate "*Cheffile" do
-      Hobo.ui.title "Installing chef dependencies via librarian"
+      Hobo.ui.title "Installing chef dependencies"
       Bundler.with_clean_env do
-        bundle_shell "librarian-chef", "install", "--verbose", :realtime => true, :indent => 2 do |line|
-          line =~ /Installing.*</ ? line.strip + "\n" : nil
+        bundle_shell "librarian-chef", "install", "--verbose", realtime: true, indent: 2 do |line|
+          line =~ /Installing.*</ ? line : 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/host.rb

@@ -0,0 +1,19 @@
+namespace :host do
+  task :config do
+    config = Hobo.user_config
+
+    config.full_name = Hobo.ui.ask "Full name", :default => config.full_name
+    config.email = Hobo.ui.ask "Email", :default => config.email
+
+    config.aws = {}
+    config.aws.access_key_id = Hobo.ui.ask "AWS access key ID", :default => config.aws.access_key_id
+    config.aws.secret_access_key = Hobo.ui.ask "AWS secret access key", :default => config.aws.secret_access_key
+
+    Hobo::Config::File.save(Hobo.user_config_file, config)
+    File.chmod(0600, Hobo.user_config_file)
+  end
+
+  task :check do
+    Hobo::HostCheck.check false
+  end
+end

data/lib/hobo/tasks/tools.rb

@@ -1,17 +1,13 @@
-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"
+      Hobo.ui.success "Getting composer.phar"
       FileUtils.mkdir_p File.dirname(bin_file)
-      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"
+      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
     end
-    Hobo.ui.separator
   end
-end
+end

data/lib/hobo/tasks/vm.rb

@@ -7,43 +7,14 @@ 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', 'assets:download', 'vm:start', 'vm:provision', 'deps:composer', 'assets:apply' ]
+  task :up => [ 'deps:chef', 'deps:composer', 'assets:download', 'vm:start', 'vm:provision', 'assets:apply' ]
 
   desc "Stop VM"
   task :stop => [ "deps:gems" ] do
     vagrantfile do
       Hobo.ui.title "Stopping VM"
-      vagrant_exec 'suspend'
+      bundle_shell "vagrant", "suspend", "--color", realtime: true, indent: 2
       Hobo.ui.separator
     end
   end
@@ -55,7 +26,7 @@ namespace :vm do
   task :destroy => [ "deps:gems" ] do
     vagrantfile do
       Hobo.ui.title "Destroying VM"
-      vagrant_exec 'destroy', '--force'
+      bundle_shell "vagrant", "destroy", "--force", "--color", realtime: true, indent: 2
       Hobo.ui.separator
     end
   end
@@ -64,7 +35,7 @@ namespace :vm do
   task :start => [ "deps:gems", "deps:vagrant_plugins" ] do
     vagrantfile do
       Hobo.ui.title "Starting vagrant VM"
-      vagrant_exec 'up', '--no-provision'
+      bundle_shell "vagrant", "up", "--no-provision", "--color", realtime: true, indent: 2
       Hobo.ui.separator
     end
   end
@@ -73,47 +44,23 @@ namespace :vm do
   task :provision => [ "deps:gems" ] do
      vagrantfile do
       Hobo.ui.title "Provisioning VM"
-      vagrant_exec 'provision'
+      bundle_shell "vagrant", "provision", "--color", realtime: true, indent: 2
       Hobo.ui.separator
     end
   end
 
   desc "Open an SSH connection"
-  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
+  task :ssh do
+    exec vm_command
   end
 
   desc "Open a MySQL cli connection"
-  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
+  task :mysql do
+    exec vm_mysql
   end
 
   desc "Open a Redis cli connection"
   task :redis do
-    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
+    exec vm_command "redis-cli"
   end
-end
+end

data/lib/hobo/ui.rb

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

data/lib/hobo/util.rb

@@ -1,41 +1,7 @@
-require 'ruby-progressbar'
-
 module Hobo
   class << self
-
-    attr_accessor :project_bar_cache
-
     def in_project?
-      !!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]
+      !Hobo.project_path.nil?
     end
   end
-end
+end