hobo-inviqa 0.0.8 → 0.0.9.pre.alpha

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzNjNzgyZWUyNWI1NmQzYWI5NmU0YTM5MzFhNTcwMDQ2ZThiZTdlMQ==
+    Y2U1MTJhYjM5ODIwNTNlYmNlYjc1MDVjOWFmYTY3ODllMGZiOTNhNg==
   data.tar.gz: !binary |-
-    YWVjNTQ0NjIwYzI2MjhmNGQ3MTgwMzM1ZDJhMmNjOGY4NjQ2MDA1Mw==
+    ZTgzZTk2NmZjZjZkYWI3YzkxODI0YThjY2RlODBlOTllMTFkMjMxZg==
 SHA512:
   metadata.gz: !binary |-
-    ZjVmZDJkM2Q1ZDUyMDQ2NWMxMTNlZTMxNTZkMmQ2MmIxMGZjNmY0MzcyN2Iy
-    N2IxMDljOGUyMzQ1MDZlMmQ3ZWNkOTRlYjlmN2M3ZWZlYjlmZTQ3M2Y1ZTZl
-    ZTM3ZGJkYjU1NTE5OWFlNmNkNjc3ZjZlMDA3MGQ2MGZlOTU4YmI=
+    MDBkZjViNTdiMGQwMDQyNzAyMDdjN2ZmMDZmMWFlZTc0Yjk3YzNjYWUyMmYz
+    NWM0ZTJmYWNlOTk4YmQzZTdhYTAzOGYwZjNlMDUyOWJjMjlkMzkwZTYzYTQ5
+    OGFlNmFlYTQxMzk2MzRjY2E3MTg2OGRlZDllZWZjODgxNDc3Zjg=
   data.tar.gz: !binary |-
-    ODU5OWJiNjczZGZlOTJmNmQyNmI0Njc5OTU1YTBjMDJkN2I3MDlmYTEwNmE3
-    Yzg0YjYwYTViODA5ODc0M2Y0ODE1ZmEwZGJkZjE1NGMzM2QxZWE5NDdiOTk4
-    YzhjY2UxNzU3MzgyMTkyMTA0MmUyYjgyNGM4YzcwOWFmMWY0Njc=
+    YTBmNDI0MjYzNmMzODQzMTA2MThjZDM3NmYwZDdiMjFlMDkzOTA4MDFiNzIx
+    NWZjZTA2ZjI5YTg4MjcyNTEwMDRkNmI3ZDg3NzdlNjI3ZDgxYzVmOWY1NmFh
+    NDM3NTYxYWIxMzg1Y2VlYzZkNjBkYjQ0NTI0MWJiOGY0YmU5NTU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.8)
+    hobo-inviqa (0.0.9.pre.alpha)
       aws-sdk (~> 1.34.0)
       bundler (~> 1.5.2)
       deepstruct (~> 0.0.5)
@@ -76,12 +76,12 @@ GEM
     multi_test (0.0.3)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    net-ssh-simple (1.6.3)
+    net-ssh (2.8.0)
+    net-ssh-simple (1.6.5)
       blockenspiel (~> 0.4.3)
       hashie (>= 1.1.0)
       net-scp (~> 1.1.0)
-      net-ssh (~> 2.7.0)
+      net-ssh (~> 2.8.0)
     nio4r (1.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)

data/README.md

@@ -10,7 +10,7 @@ Many more features are planned including assisting with host machine configurati
 
 # Installing & using
 
-Full instructions for installing and using hobo are available on the wiki at [https://github.com/inviqa/hobo-gem/wiki/User-guide]. For information on the task DSL, see [https://github.com/inviqa/hobo-gem/wiki/Hobofile-DSL].
+Full instructions for installing and using hobo are available in the [User guide](https://github.com/inviqa/hobo-gem/wiki/User-guide). For information on the task DSL, see the  [DSL guide](https://github.com/inviqa/hobo-gem/wiki/Hobofile-DSL).
 
 If you have a working development configuration (and are using OSX / linux), you may skip reading those instructions and go straight to installing the gem:
 

data/Rakefile

@@ -1,2 +1,5 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks
+
+desc "Build and install"
+task :build_install => [:build, :install]

data/bin/hobo

@@ -8,6 +8,8 @@ require 'slop'
 require 'teerb'
 require 'tmpdir'
 
+$HOBO_ARGV = ARGV
+
 error_handler = Hobo::ErrorHandlers::Friendly.new
 
 Hobo.ui = Hobo::Ui.new
@@ -37,6 +39,9 @@ Hobo.logger.formatter = proc do |severity, datetime, progname, msg|
   "#{datetime.strftime("%Y-%m-%d %H:%M:%S")}: #{severity}: #{msg}\n"
 end
 
+opts = slop.to_hash
+Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
+
 begin
   Hobo::Lib::HostCheck.check(:filter => /not_using_system_ruby/)
   Hobo.cli = Hobo::Cli.new(slop: slop)

data/lib/hobo.rb

@@ -5,6 +5,7 @@ require 'tempfile'
 require 'shellwords'
 require 'deepstruct'
 require 'os'
+require 'bundler'
 
 # DSL enhancements
 require 'hobo/metadata'
@@ -27,16 +28,27 @@ require 'hobo/error_handlers/friendly'
 require 'hobo/config/file'
 require 'hobo/logging'
 require 'hobo/config'
+
+# Asset applicators
 require 'hobo/asset_applicator'
+require 'hobo/asset_applicators/sqldump'
+require 'hobo/asset_applicators/files'
 
 # Asset sync
-require 'hobo/lib/s3sync'
+require 'hobo/lib/s3/sync'
+require 'hobo/lib/s3/local/file'
+require 'hobo/lib/s3/local/iohandler'
+require 'hobo/lib/s3/remote/file'
+require 'hobo/lib/s3/remote/iohandler'
 
 # Task helpers
 require 'hobo/helper/shell'
 require 'hobo/helper/file_locator'
-require 'hobo/helper/vm_command'
 require 'hobo/helper/http_download'
+require 'hobo/helper/vm_command'
+
+require 'hobo/lib/vm/inspector'
+require 'hobo/lib/vm/command'
 
 # Libs
 require 'hobo/lib/seed/project'
@@ -48,7 +60,8 @@ require 'hobo/lib/host_check/git'
 require 'hobo/lib/host_check/vagrant'
 require 'hobo/lib/host_check/ruby'
 require 'hobo/lib/host_check/deps'
+require 'hobo/lib/host_check/hobo'
 require 'hobo/lib/host_check'
 
 # App
-require 'hobo/cli'
+require 'hobo/cli'

data/lib/hobo/asset_applicators/files.rb

@@ -0,0 +1,5 @@
+# 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}"
+end

data/lib/hobo/asset_applicators/sqldump.rb

@@ -0,0 +1,15 @@
+Hobo.asset_applicators.register /.*\.sql\.gz/ do |file|
+  matches = file.match(/^([^\.]+).*\.sql\.gz/)
+  db = File.basename(matches[1])
+
+  begin
+    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(:auto_echo => false, :db => db) < "zcat #{file.shellescape}")
+end

data/lib/hobo/cli.rb

@@ -23,7 +23,6 @@ module Hobo
     end
 
     def start args = ARGV
-
       load_user_config
       load_builtin_tasks
       load_hobofiles
@@ -37,10 +36,9 @@ module Hobo
         @slop.parse! args
         opts = @slop.to_hash
 
-        Hobo::Lib::HostCheck.check(:filter => /vagrant.*|.*present/, :raise => true) unless opts[:'skip-host-checks']
+        perform_host_checks unless opts[:'skip-host-checks']
 
         @help_opts[:all] = opts[:all]
-        Hobo.ui.interactive = !(opts[:'non-interactive'] == true)
 
         @slop.add_callback :empty do
           show_help
@@ -105,6 +103,13 @@ module Hobo
       end
     end
 
+    def perform_host_checks
+      Hobo::Lib::HostCheck.check(
+          :filter => /vagrant.*|.*present|latest_hobo_version/,
+          :raise => true
+      )
+    end
+
     def define_global_opts slop
       slop.on '-a', '--all', 'Show hidden commands'
       slop.on '-h', '--help', 'Display help'

data/lib/hobo/helper/shell.rb

@@ -40,7 +40,8 @@ module Hobo
         :indent => 0,
         :realtime => false,
         :env => {},
-        :ignore_errors => false
+        :ignore_errors => false,
+        :exit_status => false
       }.merge! opts
 
       Hobo::Logging.logger.debug("helper.shell: Invoking '#{args.join(" ")}' with #{opts.to_s}")
@@ -72,6 +73,8 @@ module Hobo
         buffer.fsync
         buffer.rewind
 
+        return external.value.exitstatus if opts[:exit_status]
+
         raise ::Hobo::ExternalCommandError.new(args.join(" "), external.value.exitstatus, buffer) if external.value.exitstatus != 0 && !opts[:ignore_errors]
 
         return opts[:capture] ? buffer.read.strip : nil

data/lib/hobo/helper/vm_command.rb

@@ -3,51 +3,9 @@ require 'net/ssh/simple'
 
 module Hobo
   module Helper
-    attr_accessor :vm_project_mount_path
-
-    # Really expensive method to auto-detect where root project mount exists in VM.
-    # It assumes that the project root is directly mounted.
-    # We cache it in configuration once we find it so it only has to happen once.
-    def vm_project_mount_path
-      configured_path = maybe(Hobo.project_config.vm.project_mount_path)
-      return configured_path if configured_path
-      return @vm_project_mount_path if @vm_project_mount_path
-
-      tmp = Tempfile.new('vm_command_locator', Hobo.project_path)
-      tmp.write(Hobo.project_path)
-
-      locator_file = File.basename(tmp.path)
-
-      pattern = OS.windows? ? 'vboxsf' : Hobo.project_path.shellescape
-
-      # TODO genericise the command escaping from lib/hobo/patches/slop.rb to avoid nested shell escaping hell
-      sed = 's/.* on \(.*\) type.*/\\\1\\\/%%/g'.gsub('%%', locator_file)
-      locator_results = vm_shell(
-        "mount | grep #{pattern} | sed -e\"#{sed}\" | xargs md5sum",
-        :capture => true,
-        :pwd => '/',
-        :psuedo_tty => false,
-        :ignore_errors => true
-      )
-
-      tmp.close
-
-      match = locator_results.match(/^([a-z0-9]{32})\s+(.*)$/)
-
-      raise Exception.new("Unable to locate project mount point in VM") if !match
-
-      @vm_project_mount_path = File.dirname(match[2])
-
-      # Stash it in config
-      Hobo.project_config[:vm] ||= {}
-      Hobo.project_config[:vm][:project_mount_path] = @vm_project_mount_path
-      Hobo::Config::File.save(Hobo.project_config_file, Hobo.project_config)
-
-      return @vm_project_mount_path
-    end
 
     def vm_shell command, opts = {}
-      shell VmCommand.new(command, opts).to_s, opts
+      shell ::Hobo::Lib::Vm::Command.new(command, opts).to_s, opts
     end
 
     def vm_mysql opts = {}
@@ -63,225 +21,16 @@ module Hobo
       opts[:pass] = "-p#{opts[:pass].shellescape}" unless opts[:pass].empty?
       opts[:db] = opts[:db].shellescape unless opts[:db].empty?
 
-      VmCommand.new "#{opts[:mysql]} #{opts[:user]} #{opts[:pass]} #{opts[:db]}".strip, opts
+      ::Hobo::Lib::Vm::Command.new "#{opts[:mysql]} #{opts[:user]} #{opts[:pass]} #{opts[:db]}".strip, opts
     end
 
     def vm_command command = nil, opts = {}
-      VmCommand.new command, opts
+      ::Hobo::Lib::Vm::Command.new command, opts
     end
 
     private
 
-    class VmInspector
-      attr_accessor :ssh_config, :project_mount_path
-
-      def project_mount_path
-        #configured_path = maybe(Hobo.project_config.vm.project_mount_path)
-        #return configured_path if configured_path
-        #return @project_mount_path if @project_mount_path
-
-        tmp = Tempfile.new('vm_command_locator', Hobo.project_path)
-
-        begin
-          tmp.write(Hobo.project_path)
-
-          locator_file = File.basename(tmp.path)
-
-          pattern = OS.windows? ? 'vboxsf' : Hobo.project_path.shellescape
-
-          sed = 's/.* on \(.*\) type.*/\1\/%%/g'.gsub('%%', locator_file)
-          locator_results = VmCommand.new(
-            "mount | grep #{pattern} | sed -e\"#{sed}\" | xargs md5sum",
-            :capture => true,
-            :pwd => '/'
-          ).run
-        ensure
-          tmp.unlink
-        end
-
-        match = locator_results.match(/^([a-z0-9]{32})\s+(.*)$/)
-
-        raise Exception.new("Unable to locate project mount point in VM") if !match
-
-        @vm_project_mount_path = File.dirname(match[2])
-
-        # Stash it in config
-        Hobo.project_config[:vm] ||= {}
-        Hobo.project_config[:vm][:project_mount_path] = @vm_project_mount_path
-        Hobo::Config::File.save(Hobo.project_config_file, Hobo.project_config)
-
-        return @vm_project_mount_path
-      end
-
-      def ssh_config
-        return @ssh_config if @ssh_config
-        config = nil
-        locate "*Vagrantfile" do
-          config = bundle_shell "vagrant ssh-config", :capture => true
-        end
-
-        raise Exception.new "Could not retrieve VM ssh configuration" unless config
-
-        patterns = {
-          :ssh_user => /^\s*User (.*)$/,
-          :ssh_identity => /^\s*IdentityFile (.*)$/,
-          :ssh_host => /^\s*HostName (.*)$/,
-          :ssh_port => /^\s*Port (\d+)/
-        }
-
-        output = {}
-
-        patterns.each do |k, pattern|
-          match = config.match(pattern)
-          output[k] = match[1] if match
-        end
-
-        return @ssh_config = output
-      end
-    end
 
-    class VmCommand
-      class << self
-        attr_accessor :vm_inspector
-        @@vm_inspector = VmInspector.new
-      end
-
-      attr_accessor :opts, :command
-
-      def initialize command, opts = {}
-        @command = command
-        @opts = {
-          :auto_echo => false,
-          :psuedo_tty => false,
-          :pwd => opts[:pwd] || @@vm_inspector.project_mount_path,
-          :append => ''
-        }.merge(opts)
-      end
-
-      def << pipe
-        pipe = "echo #{pipe.shellescape}" if opts[:auto_echo]
-        @pipe = pipe
-        @opts[:psuedo_tty] = false
-        return self
-      end
-
-      def < pipe
-        pipe = "echo '#{pipe.shellescape}'" if opts[:auto_echo]
-        @pipe_in_vm = pipe
-        @opts[:psuedo_tty] = false
-        return self
-      end
-
-      # TODO Refactor in to ssh helper with similar opts to shell helper
-      # TODO Migrate all vm_shell functionality this direction
-      def run
-        return if @command.nil?
-        opts = @@vm_inspector.ssh_config.merge(@opts)
-
-        Net::SSH::Simple.sync do
-          ssh_opts = {
-            :user => opts[:ssh_user],
-            :port => opts[:ssh_port],
-            :forward_agent => true,
-            :global_known_hosts_file => "/dev/null",
-            :paranoid => false,
-            :user_known_hosts_file => "/dev/null"
-          }
-
-          ssh_opts[:keys] = [opts[:ssh_identity]] if opts[:ssh_identity]
-
-          tmp = Tempfile.new "vm_command_exec"
-
-          begin
-            filename = File.basename(tmp.path)
-            remote_file = "/tmp/#{filename}"
-            tmp.write "#{@command}#{opts[:append]}"
-            tmp.close
-
-            scp_put opts[:ssh_host], tmp.path, remote_file, ssh_opts
-            result = ssh opts[:ssh_host], "cd #{opts[:pwd]}; exec /bin/bash #{remote_file}", ssh_opts
-            ssh opts[:ssh_host], "rm #{remote_file}", ssh_opts
-
-            # Throw exception if exit code not 0
-
-            return opts[:capture] ? result.stdout : result.success
-          ensure
-            tmp.unlink
-          end
-        end
-      end
-
-      # TODO Speed up Vagrant SSH connections
-      # May need to be disabled for windows (mm_send_fd: UsePrivilegeSeparation=yes not supported)
-      # https://gist.github.com/jedi4ever/5657094
-
-      def to_s
-        opts = @@vm_inspector.ssh_config.merge(@opts)
-
-        psuedo_tty = opts[:psuedo_tty] ? "-t" : ""
-
-        ssh_command = [
-          "ssh",
-          "-o 'UserKnownHostsFile /dev/null'",
-          "-o 'StrictHostKeyChecking no'",
-          "-o 'ForwardAgent yes'",
-          "-o 'LogLevel FATAL'",
-          "-p #{opts[:ssh_port]}",
-          "-i #{opts[:ssh_identity].shellescape}",
-          psuedo_tty,
-          "#{opts[:ssh_user].shellescape}@#{opts[:ssh_host].shellescape}"
-        ].join(" ")
-
-        pwd_set_command = " -- \"cd #{@opts[:pwd].shellescape}; exec /bin/bash"
-
-        vm_command = [
-          @pipe_in_vm,
-          @command
-        ].compact.join(" | ")
-
-        command = [
-          ssh_command + pwd_set_command,
-          vm_command.empty? ? nil : vm_command.shellescape
-        ].compact.join(" -c ") + "#{opts[:append].shellescape}\""
-
-        [
-          @pipe,
-          command
-        ].compact.join(" | ")
-      end
-
-      def to_str
-        to_s
-      end
-
-      private
-
-      def vagrant_config
-        return @@vagrant_config if @@vagrant_config
-        config = nil
-        locate "*Vagrantfile" do
-          config = bundle_shell "vagrant ssh-config", :capture => true
-        end
-
-        raise Exception.new "Could not retrieve VM ssh configuration" unless config
-
-        patterns = {
-          :ssh_user => /^\s+User (.*)$/,
-          :ssh_identity => /^\s+IdentityFile (.*)$/,
-          :ssh_host => /^\s+HostName (.*)$/,
-          :ssh_port => /^\s+Port (\d+)/
-        }
-
-        output = {}
-
-        patterns.each do |k, pattern|
-          match = config.match(pattern)
-          output[k] = match[1]
-        end
-
-        return @@vagrant_config = output
-      end
-    end
   end
 end