hobo-inviqa 0.0.8 → 0.0.9.pre.alpha

data/lib/hobo/lib/vm/command.rb

@@ -0,0 +1,125 @@
+module Hobo
+  module Lib
+    module Vm
+      class Command
+        class << self
+          attr_accessor :vm_inspector
+          @@vm_inspector = Inspector.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
+              with_session opts[:ssh_host], opts do |session|
+                session.process.popen3 do |input, output, error|
+
+                end
+              end
+
+              # 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
+      end
+    end
+  end
+end

data/lib/hobo/lib/vm/inspector.rb

@@ -0,0 +1,73 @@
+module Hobo
+  module Lib
+    module Vm
+      class Inspector
+        attr_accessor :ssh_config, :project_mount_path, :project_config
+
+        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
+    end
+  end
+end

data/lib/hobo/tasks/assets.rb

@@ -1,20 +1,9 @@
-require 'hobo/lib/s3sync'
+require 'hobo/lib/s3/sync'
 
 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|
@@ -23,16 +12,9 @@ namespace :assets do
     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) || ENV['AWS_ACCESS_KEY_ID'],
-        maybe(Hobo.user_config.aws.secret_access_key) || ENV['AWS_SECRET_ACCESS_KEY']
-      )
-
-      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
+      sync = Hobo::Lib::S3::Sync.new(Hobo.aws_credentials)
+      changes = sync.sync(s3_uri, "tools/assets/#{env}")
+      Hobo.ui.warning "  No changes required" if (changes[:add] + changes[:remove]).length == 0
     else
       Hobo.ui.warning "  No asset bucket configured. Skipping..."
     end
@@ -42,23 +24,14 @@ namespace :assets do
   desc "Upload project assets"
   option "-e=", "--env=", "Environment"
   task :upload do |task, args|
-
     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) || ENV['AWS_ACCESS_KEY_ID'],
-        maybe(Hobo.user_config.aws.secret_access_key) || ENV['AWS_SECRET_ACCESS_KEY']
-      )
-
-      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
-
+      sync = Hobo::Lib::S3::Sync.new(Hobo.aws_credentials)
+      changes = sync.sync("tools/assets/#{env}", s3_uri)
+      Hobo.ui.warning "  No changes required" if (changes[:add] + changes[:remove]).length == 0
     else
       Hobo.ui.warning "  No asset bucket configured. Skipping..."
     end
@@ -84,25 +57,3 @@ namespace :assets do
 
   end
 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}"
-end
-
-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/tasks/deps.rb

@@ -27,7 +27,7 @@ namespace :deps do
 
         check = Hobo::Lib::HostCheck.check(:filter => /php_present/)
 
-        if check["Php present"] == :ok
+        if check[:php_present] == :ok
           begin
             shell *args
             complete = true

data/lib/hobo/tasks/magento.rb

@@ -0,0 +1,75 @@
+namespace :tools do
+  desc "Fetches the n98-magerun utility"
+  task :n98magerun do
+    FileUtils.mkdir_p "bin"
+    vm_shell '"wget" --no-check-certificate "https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar" -O bin/n98-magerun.phar'
+    FileUtils.chmod 0755, "bin/n98-magerun.phar"
+  end
+end
+
+desc "Magento related tasks"
+namespace :magento do
+
+  desc "Setup script tasks"
+  namespace :'setup-scripts' do
+    desc "Run magento setup scripts"
+    task :run => ['tools:n98magerun']  do
+      Hobo.ui.success "Running setup scripts"
+      vm_shell("bin/n98-magerun.phar sys:setup:incremental -n", :realtime => true, :indent => 2)
+    end
+  end
+
+  desc "Cache tasks"
+  namespace :cache do
+    desc "Clear cache"
+    task :clear => ['tools:n98magerun']  do
+      Hobo.ui.success "Clearing magento cache"
+      vm_shell("bin/n98-magerun.phar cache:flush", :realtime => true, :indent => 2)
+    end
+  end
+
+  desc "Confgiure magento base URLs"
+  task :'configure-urls' => ['tools:n98magerun'] do
+    Hobo.ui.success "Configuring magento base urls"
+    url = "http://#{Hobo.project_config.hostname}/"
+    vm_shell("bin/n98-magerun.phar config:set web/unsecure/base_url '#{url}'", :realtime => true, :indent => 2)
+    vm_shell("bin/n98-magerun.phar config:set web/secure/base_url '#{url}'", :realtime => true, :indent => 2)
+  end
+
+  desc "Enable magento errors"
+  task :'enable-errors' do
+    error_config = File.join(Hobo.project_path, 'public/errors/local.xml')
+
+    FileUtils.cp(
+        error_config + ".sample",
+        error_config
+    ) unless File.exists? error_config
+  end
+
+  desc "Initializes magento specifics on the virtual machine after a fresh build"
+  task :'initialize-vm' => ['magento:enable-errors', 'tools:n98magerun', 'magento:setup-scripts:run', 'magento:configure-urls'] do
+    initialized = vm_shell("bin/n98-magerun.phar admin:user:list | grep admin", :exit_status => true) == 0
+
+    unless initialized
+      Hobo.ui.success "Initializing VM"
+      Hobo.ui.separator
+
+      commands = {
+        "Creating admin user (admin:admin)" => vm_command("bin/n98-magerun.phar admin:user:create admin '' admin admin admin"),
+        "Enabling rewrites" => vm_command("bin/n98-magerun.phar config:set web/seo/use_rewrites 1"),
+      }
+
+      commands.each do |description, command|
+        Hobo.ui.success description
+        shell command.to_s, :realtime => true, :indent => 2
+        Hobo.ui.separator
+      end
+
+      # Needs to happen at the end of everything
+      Rake::Task['magento:cache:clear'].invoke
+    end
+  end
+end
+
+# Modify vm:up task to add vm initialization
+task "vm:up" => ["magento:initialize-vm"]

data/lib/hobo/tasks/system.rb

@@ -4,10 +4,13 @@ namespace :system do
   desc "Check system configuration for potential problems"
   task :check do
     Hobo::Lib::HostCheck.check.each do |k,v|
+      name = k.to_s.gsub('_', ' ')
+      name[0] = name[0].upcase
+
       if v == :ok
-        Hobo.ui.success "#{k}: OK"
+        Hobo.ui.success "#{name}: OK"
       else
-        Hobo.ui.error "#{k}: FAILED\n"
+        Hobo.ui.error "#{name}: FAILED\n"
         Hobo.ui.warning v.advice.gsub(/^/, '  ')
       end
     end

data/lib/hobo/util.rb

@@ -5,6 +5,10 @@ module Hobo
 
     attr_accessor :project_bar_cache
 
+    def relaunch! env = {}
+      Kernel.exec(env, 'hobo', '--skip-host-checks', *$HOBO_ARGV)
+    end
+
     def in_project?
       !!Hobo.project_path
     end
@@ -37,5 +41,12 @@ module Hobo
 
       return @progress_bar_cache[file]
     end
+
+    def aws_credentials
+      {
+        :access_key_id => maybe(Hobo.user_config.aws.access_key_id) || ENV['AWS_ACCESS_KEY_ID'],
+        :secret_access_key => maybe(Hobo.user_config.aws.secret_access_key) || ENV['AWS_SECRET_ACCESS_KEY']
+      }
+    end
   end
 end

data/lib/hobo/version.rb

@@ -1,3 +1,3 @@
 module Hobo
-  VERSION = '0.0.8'
+  VERSION = '0.0.9-alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo-inviqa
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9.pre.alpha
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -302,6 +302,8 @@ files:
 - hobo.gemspec
 - lib/hobo.rb
 - lib/hobo/asset_applicator.rb
+- lib/hobo/asset_applicators/files.rb
+- lib/hobo/asset_applicators/sqldump.rb
 - lib/hobo/cli.rb
 - lib/hobo/config.rb
 - lib/hobo/config/file.rb
@@ -317,12 +319,19 @@ files:
 - lib/hobo/lib/host_check.rb
 - lib/hobo/lib/host_check/deps.rb
 - lib/hobo/lib/host_check/git.rb
+- lib/hobo/lib/host_check/hobo.rb
 - lib/hobo/lib/host_check/ruby.rb
 - lib/hobo/lib/host_check/vagrant.rb
-- lib/hobo/lib/s3sync.rb
+- lib/hobo/lib/s3/local/file.rb
+- lib/hobo/lib/s3/local/iohandler.rb
+- lib/hobo/lib/s3/remote/file.rb
+- lib/hobo/lib/s3/remote/iohandler.rb
+- lib/hobo/lib/s3/sync.rb
 - lib/hobo/lib/seed/project.rb
 - lib/hobo/lib/seed/replacer.rb
 - lib/hobo/lib/seed/seed.rb
+- lib/hobo/lib/vm/command.rb
+- lib/hobo/lib/vm/inspector.rb
 - lib/hobo/logging.rb
 - lib/hobo/metadata.rb
 - lib/hobo/null.rb
@@ -334,6 +343,7 @@ files:
 - lib/hobo/tasks/config.rb
 - lib/hobo/tasks/debug.rb
 - lib/hobo/tasks/deps.rb
+- lib/hobo/tasks/magento.rb
 - lib/hobo/tasks/seed.rb
 - lib/hobo/tasks/system.rb
 - lib/hobo/tasks/system/completions.rb
@@ -378,9 +388,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2