hobo-inviqa 0.0.7.pre.rc3 → 0.0.7

data/lib/hobo/lib/host_check.rb

@@ -4,34 +4,20 @@ module Hobo
       class << self
         include Hobo::Lib::HostCheck
 
-        def check opts = {}
-          opts = {
-            :filter => nil,
-            :raise => false
-          }.merge(opts)
-
-          results = {}
+        def check silent = true
           methods = Hobo::Lib::HostCheck.public_instance_methods(false)
           methods.each do |method|
-            next if opts[:filter] && !method.match(opts[:filter])
-
             name = method.to_s.gsub('_', ' ')
             name[0] = name[0].upcase
-            if opts[:raise]
+            begin
               self.send method
-            else
-              begin
-                self.send method
-                results[name] = :ok
-              rescue Hobo::Error => error
-                results[name] = error
-              end
+              Hobo.ui.success "#{name}: OK" unless silent
+            rescue
+              Hobo.ui.error "#{name}: FAILED" unless silent
             end
           end
-
-          return results
         end
       end
     end
   end
-end
+end

data/lib/hobo/lib/host_check/deps.rb

@@ -2,38 +2,20 @@ module Hobo
   module Lib
     module HostCheck
       def ssh_present
-        advice = "The SSH command could not be located on your system.\n\n"
-
-        if OS.windows?
-          advice += "To make SSH available you must re-install git using the installer from http://git-scm.com/downloads ensuring you select the 'Use git and unix tools everywhere' option."
-        else
-          advice += "Please install openssh using your package manager."
-        end
-
         begin
           shell "ssh -V"
         rescue Errno::ENOENT
-          raise Hobo::HostCheckError.new("SSH is missing", advice)
+          raise Hobo::MissingDependency.new("ssh")
         end
       end
 
       def php_present
-        advice = <<-EOF
-The PHP command could not be located on your system.
-
-This is an optional command that can speed up composer dependency installs.
-
-Please install it from your package manager ensuring that the following command does not produce any errors:
-
-  php -r "readfile('https://getcomposer.org/installer');" | php
-EOF
-
         begin
-          shell "php --version"
+          shell "php -v"
         rescue Errno::ENOENT
-          raise Hobo::HostCheckError.new("PHP is missing", advice)
+          raise Hobo::MissingDependency.new("php")
         end
       end
     end
   end
-end
+end

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

@@ -2,70 +2,46 @@ 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::HostCheckError.new("Git is missing", advice)
+          raise Hobo::MissingDependency.new("ssh")
         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
-          raise Hobo::HostCheckError.new("Git config is incomplete (Full name)", advice)
+          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}"
         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
-          raise Hobo::HostCheckError.new("Git config is incomplete (Email)", advice)
+          email = Hobo.ui.ask "Email address"
+          shell "git config --global user.email #{email.shellescape}"
         end
       end
 
       def git_autocrlf_disabled
-        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
+        return true
         begin
           value = shell "git config core.autocrlf", :capture => true
           if value != "false"
-            raise Hobo::HostCheckError.new("Git config has autocrlf enabled", advice)
+            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
+
           end
         rescue Hobo::ExternalCommandError
           # NOP
@@ -73,4 +49,4 @@ EOF
       end
     end
   end
-end
+end

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

@@ -2,51 +2,41 @@ module Hobo
   module Lib
     module HostCheck
       def not_using_system_ruby
-        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
+        return if Gem.win_platform?
         which = shell "which ruby", :capture => true
-        unless which =~ /\.rbenv|\.rvm/
-          raise Hobo::HostCheckError.new("Hobo is running under a system ruby", advice)
+        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"
         end
       end
 
       def system_paths_for_ruby
-        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
-
+        return if Gem.win_platform?
         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 Hobo::HostCheckError.new("System paths appear to be mis-ordered", advice) if system_before_ruby or ruby_after_system
+          raise "Bad system paths" 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,43 +4,12 @@ module Hobo
   module Lib
     module HostCheck
       def vagrant_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
+        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
       end
     end
   end
-end
+end

data/lib/hobo/lib/s3sync.rb

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

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

@@ -16,6 +16,9 @@ module Hobo
           config[:seed][:version] = seed.version
           config[:hostname] = "#{config[:name]}.development.local"
           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)
@@ -41,17 +44,10 @@ 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