hobo-inviqa 0.0.6 → 0.0.7.pre.rc1

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,22 +65,25 @@ module Hobo
         return delta
       end
 
-      def progress file, written, total, type
-        @progress ||= {}
-        @progress[file] ||= ProgressBar.create(
-          :title => file,
-          :total => total,
-          :format => "%t [%B] %p%% %e",
-        )
+      private
 
-        case type
-          when :update
-            @progress[file].progress = written
-          when :finished
-            @progress[file].finish
-        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
 
       class Local
         include Hobo::Logging
@@ -127,7 +110,7 @@ module Hobo
         end
 
         def rm file
-          File.unlink file
+          File.unlink File.join(@path, file)
         end
       end
 
@@ -230,4 +213,4 @@ module Hobo
       end
     end
   end
-end
+end

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

@@ -41,10 +41,17 @@ 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

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

@@ -15,24 +15,36 @@ module Hobo
           path = File.expand_path(path)
           FileUtils.mkdir_p path
 
-          logger.info "Exporting seed to #{path}"
+          Hobo.ui.success "Exporting seed to #{path}"
 
           tmp_path = Dir.mktmpdir("hobo-seed-export")
 
           Dir.chdir @seed_path do
-            Hobo::Helper.shell "git clone . #{tmp_path.shellescape}"
+            Hobo::Helper.shell "git clone . #{tmp_path}"
           end
 
+          Hobo.ui.success "Exporting seed submodules"
+
           Dir.chdir tmp_path do
             Hobo::Helper.shell "git submodule update --init"
             Hobo::Helper.shell "git archive master | tar -x -C #{path.shellescape}"
-            Hobo::Helper.shell "git submodule foreach 'cd #{tmp_path.shellescape}/$path && git archive HEAD | tar -x -C #{path.shellescape}/$path'"
+
+            # Export submodules
+            # git submodule foreach does not play nice on windows so we fake it here
+            submodules = Hobo::Helper.shell "git submodule status", :capture => true
+            submodules.split("\n").each do |line|
+              matches = line.match /^\s*[a-z0-9]+ (.+) \(.*\)/
+              next unless matches
+              submodule_path = matches[1]
+              Hobo::Helper.shell "cd #{tmp_path}/#{submodule_path.shellescape} && git archive HEAD | tar -x -C #{path}/#{submodule_path.shellescape}"
+            end
           end
 
           FileUtils.rm_f tmp_path
         end
 
         def update
+          Hobo.ui.success "Fetching / Updating seed"
           FileUtils.mkdir_p @seed_path
           if File.exists? File.join(@seed_path, 'HEAD')
             Dir.chdir @seed_path do

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

@@ -4,22 +4,35 @@ desc "Project asset commands"
 project_only
 namespace :assets do
 
+  def handle_s3_error
+    begin
+      yield
+    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."
+    end
+  end
+
   desc "Download project assets"
   option "-e=", "--env=", "Environment"
   task :download do |task, args|
-    Hobo.ui.success "Synchonizing assets (download)"
+    Hobo.ui.success "Synchronizing assets (download)"
 
     unless Hobo.project_config.asset_bucket.nil?
       env = task.opts[:env] || args[:env] || 'development'
       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']
       )
 
-      changes = sync.sync(s3_uri, "tools/assets/#{env}")
-      Hobo.ui.warning "  No changes required" if (changes[:add] + changes[:remove]).length == 0
+      handle_s3_error do
+        changes = sync.sync(s3_uri, "tools/assets/#{env}")
+        Hobo.ui.warning "  No changes required" if (changes[:add] + changes[:remove]).length == 0
+      end
     else
       Hobo.ui.warning "  No asset bucket configured. Skipping..."
     end
@@ -30,19 +43,22 @@ namespace :assets do
   option "-e=", "--env=", "Environment"
   task :upload do |task, args|
 
-    Hobo.ui.success "Synchronzing assets (upload)"
+    Hobo.ui.success "Synchronizing assets (upload)"
 
     unless Hobo.project_config.asset_bucket.nil?
       env = task.opts[:env] || args[:env] || 'development'
       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']
       )
 
-      changes = sync.sync("tools/assets/#{env}", s3_uri)
-      Hobo.ui.warning "  No changes required" if (changes[:add] + changes[:remove]).length == 0
+      handle_s3_error do
+        changes = sync.sync("tools/assets/#{env}", s3_uri)
+        Hobo.ui.warning "  No changes required" if (changes[:add] + changes[:remove]).length == 0
+      end
+
     else
       Hobo.ui.warning "  No asset bucket configured. Skipping..."
     end
@@ -72,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|
@@ -82,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

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,10 +52,15 @@ 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
@@ -48,10 +73,10 @@ namespace :deps do
       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 : nil
+          line =~ /Installing.*</ ? line.strip + "\n" : nil
         end
       end
       Hobo.ui.separator
     end
   end
-end
+end

data/lib/hobo/tasks/seed.rb

@@ -38,7 +38,7 @@ namespace :seed do
     Hobo::Lib::Seed::Project.new().setup(seed, config)
 
     Hobo.ui.separator
-    Hobo.ui.success "Your new project is available in #{Hobo.project_path}.\n"
+    Hobo.ui.success "Your new project is available in #{Hobo.project_path}."
     Hobo.ui.success "You will need to review the initial commit and if all is well, push the repository to github using `git push origin --all`."
     Hobo.ui.separator
   end