hobo-inviqa 0.0.7 → 0.0.8

data/lib/hobo/lib/host_check/git.rb

@@ -2,46 +2,70 @@ module Hobo
   module Lib
     module HostCheck
       def git_present
+        advice = "The Git command could not be detected on your system.\n\n"
+        if OS.windows?
+          advice += "Please install it from http://git-scm.com/downloads ensuring you select the 'Use git and unix tools everywhere' option."
+        else
+          advice += "Please install it using your package manager."
+        end
+
         begin
           shell "git --version"
         rescue Errno::ENOENT
-          raise Hobo::MissingDependency.new("ssh")
+          raise Hobo::HostCheckError.new("Git is missing", advice)
         end
       end
 
       def git_config_name_set
+        advice = <<-EOF
+You have not set your name in git config!
+
+Please do so with the following command:
+  git config --global user.name <your name here>
+EOF
         begin
           shell "git config user.name"
         rescue Hobo::ExternalCommandError
-          Hobo.ui.error "You must provide git with your full name"
-          name = Hobo.ui.ask "Full name"
-          shell "git config --global user.name #{name.shellescape}"
+          raise Hobo::HostCheckError.new("Git config is incomplete (Full name)", advice)
         end
       end
 
       def git_config_email_set
+        advice = <<-EOF
+You have not set your email in git config!
+
+Please do so with the following command:
+  git config --global user.email <your email here>
+EOF
+
         begin
           shell "git config user.email"
         rescue Hobo::ExternalCommandError
-          email = Hobo.ui.ask "Email address"
-          shell "git config --global user.email #{email.shellescape}"
+          raise Hobo::HostCheckError.new("Git config is incomplete (Email)", advice)
         end
       end
 
       def git_autocrlf_disabled
-        return true
+        return unless OS.windows?
+
+        advice = <<-EOF
+You're using git with the core.autocrlf option enabled.
+
+This setting can often cause problems when you clone a repository on windows but need to execute the contents of that repository within a linux VM.
+
+You can disable autocrlf globally with the following command:
+  git config --global core.autocrlf false
+
+Disabling this setting will cause git to see all line endings as changed in a repository that was cloned with it enabled.
+As such, you must either enable it just for those repositories or delete and re-clone them with the setting disabled.
+
+You can enable the setting on a per-clone basis by ensuring that you are in the project directory and executing the following command:
+  git config core-autocrlf true
+EOF
         begin
           value = shell "git config core.autocrlf", :capture => true
           if value != "false"
-            Hobo.ui.error "You're using git with autocrlf!"
-            Hobo.ui.error "This setting can cause problems executing scripts within VMs."
-            Hobo.ui.error "If you've had it enabled for a while, you'll need to check out all of your repositories again if you change it."
-            disable = Hobo.ui.ask "Would you like to disable this setting?", :default => true
-            if disable
-              shell "git config --global core.autocrlf false"
-              Hobo.ui.success "Disabled autocrlf\nYou can re-enable it by executing `git config --global core.autocrlf true"
-            end
-
+            raise Hobo::HostCheckError.new("Git config has autocrlf enabled", advice)
           end
         rescue Hobo::ExternalCommandError
           # NOP
@@ -49,4 +73,4 @@ module Hobo
       end
     end
   end
-end
+end

data/lib/hobo/lib/host_check/ruby.rb

@@ -2,41 +2,51 @@ module Hobo
   module Lib
     module HostCheck
       def not_using_system_ruby
-        return if Gem.win_platform?
+        return if OS.windows?
+        advice = <<-EOF
+You're using a system ruby install which can cause issues with installing Gems and running some older projects.
+
+rbenv is HIGHLY recommended.
+
+You can install it with the following command:
+  curl https://raw.github.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash
+
+Once installed, run the following to set it as the default ruby and re-install hobo-inviqa:
+  rbenv install 1.9.3-p448 && rbenv global 1.9.3-448 && gem install hobo-inviqa
+EOF
         which = shell "which ruby", :capture => true
-        unless which =~ /\.rbenc|\.rvm/
-          Hobo.ui.error "You're using a system ruby install! rbenv is HIGHLY recommended"
-          Hobo.ui.error "You can install it with the following command:\n"
-          Hobo.ui.error "  curl https://raw.github.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash\n"
-          Hobo.ui.error "Once installed, run the following:\n"
-          Hobo.ui.error "  rbenv install 1.9.3-p448 && rbenv global 1.9.3-448 && gem install hobo-inviqa"
-          raise "System ruby in use"
+        unless which =~ /\.rbenv|\.rvm/
+          raise Hobo::HostCheckError.new("Hobo is running under a system ruby", advice)
         end
       end
 
       def system_paths_for_ruby
-        return if Gem.win_platform?
+        return if OS.windows?
+
+        advice = <<-EOF
+The ordering of your system paths may cause a problem with Gems.
+
+Unfortunately we can't automatically fix this for you at this time.
+
+Please seek assistance.
+
+Your paths were detected as:
+
+#{ENV['PATH'].split(':').join("\n")}
+EOF
+
         paths = ENV['PATH'].split(':')
         system_path_found = false
         ruby_path_found = false
         paths.each do |path|
           system_before_ruby = system_path_found && !ruby_path_found
           ruby_after_system = path =~ /\.rbenv|\.rvm/ && system_path_found
-          raise "Bad system paths" if system_before_ruby or ruby_after_system
+          raise Hobo::HostCheckError.new("System paths appear to be mis-ordered", advice) if system_before_ruby or ruby_after_system
 
           ruby_path_found = true if path =~ /\.rbenv|\.rvm/
           system_path_found = true if path =~ /\/usr\/bin|\/usr\/local\/bin/
         end
       end
-
-      def ruby_include_paths
-        paths = $:
-        bad_paths = paths.reject do |path|
-          path.match /\.rbenv|\.rvm/
-        end.compact.length > 0
-
-        raise "Bad gem paths" if bad_paths
-      end
     end
   end
-end
+end

data/lib/hobo/lib/host_check/vagrant.rb

@@ -4,12 +4,43 @@ module Hobo
   module Lib
     module HostCheck
       def vagrant_version
-        version = shell "vagrant --version", :capture => true
-        version.gsub!(/^Vagrant /, '')
-        version = ::Semantic::Version.new version
-        minimum_version = ::Semantic::Version.new "1.3.5"
-        raise "Vagrant too old" if version < minimum_version
+        begin
+          version = shell "vagrant --version", :capture => true
+          version.gsub!(/^Vagrant /, '')
+          version = ::Semantic::Version.new version
+          minimum_version = ::Semantic::Version.new "1.3.5"
+
+          advice = <<-EOF
+  The version of vagrant which you are using (#{version}) is less than the minimum required (#{minimum_version}).
+
+  Please go to http://www.vagrantup.com/downloads.html and download the latest version for your platform.
+  EOF
+          raise Hobo::HostCheckError.new("Vagrant is too old!", advice) if version < minimum_version
+        rescue Errno::ENOENT
+          advice = <<-EOF
+Vagrant could not be detected on the path!
+
+Please go to http://www.vagrantup.com/downloads.html and download the latest version for your platform.
+EOF
+          raise Hobo::HostCheckError.new("Vagrant is not on the path", advice)
+        rescue Hobo::ExternalCommandError => error
+          advice = <<-EOF
+Vagrant produced an error while checking its presence.
+
+This is usually caused by using the vagrant gem which is no longer supported.
+
+Uninstall any gem version of vagrant with the following command selecting "yes" to any prompt:
+  gem uninstall vagrant
+
+You can then download and install the latest version from http://www.vagrantup.com/downloads.html
+
+If you do not have any vagrant gems installed it may be possible that a gem such as vagrant-wrapper is installed and is failing.
+
+Please seek assistance from #devops if this is the case.
+EOF
+          raise Hobo::HostCheckError.new("Vagrant produced an error while checking presence", advice)
+        end
       end
     end
   end
-end
+end

data/lib/hobo/lib/s3sync.rb

@@ -1,6 +1,5 @@
 require 'aws-sdk'
 require 'fileutils'
-require 'ruby-progressbar'
 
 module Hobo
   module Lib
@@ -11,7 +10,8 @@ module Hobo
         opts = {
           :access_key_id => key_id,
           :secret_access_key => secret,
-          :verify_response_body_content_length => false
+          :verify_response_body_content_length => false,
+          :max_retries => 15
         }
 
         logger.debug("s3sync: Options #{opts}")
@@ -19,26 +19,8 @@ module Hobo
         @s3 = AWS::S3.new opts
       end
 
-      def delta source, dest
-        to_add = (source.sort - dest.sort).map(&:first)
-        to_remove = (dest.sort - source.sort).map(&:first)
-        to_remove = to_remove - to_add
-
-        {
-          :add => to_add,
-          :remove => to_remove
-        }
-      end
-
-      def io_handler uri
-        parsed = URI.parse(uri)
-        parsed.scheme == 's3' ?
-          Remote.new(@s3, parsed.host, parsed.path) :
-          Local.new(uri)
-      end
-
       def sync source, dest, opts = {}
-        opts = { :progress => method(:progress) }.merge(opts)
+        opts = { :progress => Hobo.method(:progress) }.merge(opts)
 
         source_io = io_handler(source)
         destination_io = io_handler(dest)
@@ -62,19 +44,17 @@ module Hobo
 
           source_file.buffer
 
-          written = 0
           size = source_file.size
           destination_file.write({ :size => source_file.size }) do |buffer, bytes|
             chunk = source_file.read(bytes)
             buffer.write(chunk)
-            written += chunk.length
-            opts[:progress].call(file, written, size, :update)
+            opts[:progress].call(file, chunk.length, size, :update)
           end
 
           destination_file.close
           source_file.close
 
-          opts[:progress].call(file, written, size, :finish)
+          opts[:progress].call(file, 0, size, :finish)
         end
 
         delta[:remove].each do |file|
@@ -85,27 +65,25 @@ module Hobo
         return delta
       end
 
-      def progress file, written, total, type
-        opts = {
-          :title => file,
-          :total => total,
-          :format => "%t [%B] %p%% %e"
-        }
-
-        # Hack to stop newline spam on windows
-        opts[:length] = 79 if Gem::win_platform?
+      private
 
-        @progress ||= {}
-        @progress[file] ||= ProgressBar.create(opts)
+      def delta source, dest
+        to_add = (source.sort - dest.sort).map(&:first)
+        to_remove = (dest.sort - source.sort).map(&:first)
+        to_remove = to_remove - to_add
 
-        case type
-          when :update
-            @progress[file].progress = written
-          when :finished
-            @progress[file].finish
-        end
+        {
+          :add => to_add,
+          :remove => to_remove
+        }
       end
 
+      def io_handler uri
+        parsed = URI.parse(uri)
+        parsed.scheme == 's3' ?
+          Remote.new(@s3, parsed.host, parsed.path) :
+          Local.new(uri)
+      end
 
       class Local
         include Hobo::Logging
@@ -132,7 +110,7 @@ module Hobo
         end
 
         def rm file
-          File.unlink file
+          File.unlink File.join(@path, file)
         end
       end
 
@@ -235,4 +213,4 @@ module Hobo
       end
     end
   end
-end
+end

data/lib/hobo/lib/seed/project.rb

@@ -14,11 +14,8 @@ module Hobo
           seed.update
           seed.export config[:project_path]
           config[:seed][:version] = seed.version
-          config[:hostname] = "#{config[:name]}.development.local"
+          config[:hostname] = "#{config[:name]}.dev"
           config[:asset_bucket] = "inviqa-assets-#{config[:name]}"
-          config[:mysql] = {
-            :password => "984C42CF342f7j6" # Packer default password
-          }
 
           @opts[:replacer].replace(config[:project_path], config)
           load_seed_init(config)
@@ -44,13 +41,20 @@ module Hobo
         def initialize_git path, git_url
           Dir.chdir path do
             Hobo::Helper.shell 'git', 'init'
-            Hobo::Helper.shell 'git', 'remote', 'add', 'origin', git_url
             Hobo::Helper.shell 'git', 'add', '--all'
             Hobo::Helper.shell 'git', 'commit', '-m', "'Initial hobo project'"
             Hobo::Helper.shell 'git', 'checkout', '-b', 'develop'
+
+            # Github for windows gets clever adding origin / upstream remotes in system level gitconfig
+            # :facepalm:
+            begin
+              Hobo::Helper.shell 'git', 'remote', 'add', 'origin', git_url
+            rescue Hobo::ExternalCommandError
+              Hobo::Helper.shell 'git', 'remote', 'set-url', 'origin', git_url
+            end
           end
         end
       end
     end
   end
-end
+end

data/lib/hobo/patches/slop.rb

@@ -1,7 +1,7 @@
 require 'slop'
 
 class Slop
-  attr_accessor :long_desc, :arg_list, :hidden, :desc
+  attr_accessor :long_desc, :arg_list, :hidden, :desc, :unparsed
 
   # Slop has a description method but it uses @config which is inherited
   # This is not desired behaviour
@@ -29,4 +29,23 @@ class Slop
     @config[:project_only] = value unless value.nil?
     @config[:project_only]
   end
-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

data/lib/hobo/tasks/assets.rb

@@ -10,7 +10,8 @@ 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.error "  AWS credentials not set!\n\nRun `hobo host config` to set them."
+      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."
     end
   end
 
@@ -24,8 +25,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),
-        maybe(Hobo.user_config.aws.secret_access_key)
+        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']
       )
 
       handle_s3_error do
@@ -49,8 +50,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),
-        maybe(Hobo.user_config.aws.secret_access_key)
+        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']
       )
 
       handle_s3_error do
@@ -87,9 +88,7 @@ end
 # Built in applicators
 Hobo.asset_applicators.register /.*\.files\.(tgz|tar\.gz|tar\.bz2)/ do |file|
   Hobo.ui.title "Applying file dump (#{file})"
-  Dir.chdir Hobo.project_path do
-    shell "tar -xvf #{file.shellescape}"
-  end
+  vm_shell "tar -xvf #{file.shellescape}"
 end
 
 Hobo.asset_applicators.register /.*\.sql\.gz/ do |file|
@@ -97,15 +96,13 @@ Hobo.asset_applicators.register /.*\.sql\.gz/ do |file|
   db = File.basename(matches[1])
 
   begin
-    shell(vm_mysql << "USE #{db}")
-    Hobo.ui.warning "Already applied (#{file})"
-    next
+    shell(vm_mysql(:mysql => 'mysqladmin', :append => " create #{db.shellescape}"))
   rescue Hobo::ExternalCommandError => e
+    Hobo.ui.warning "Already applied (#{file})"
     raise e if e.exit_code != 1
+    next
   end
 
   Hobo.ui.title "Applying mysqldump (#{file})"
-
-  shell(vm_mysql << "CREATE DATABASE #{db}")
-  shell(vm_mysql(:auto_echo => false, :db => db) << "zcat #{file.shellescape}")
-end
+  shell(vm_mysql(:auto_echo => false, :db => db) < "zcat #{file.shellescape}")
+end