hem 1.0.1.beta6 → 1.1.0

data/lib/hem/tasks/mysql.rb

@@ -0,0 +1,16 @@
+desc "MySQL related commands"
+
+namespace :mysql do
+  desc "Open a MySQL cli connection"
+  option '-D=', '--db=', 'Database'
+  task :console do |task|
+    opts = { :psuedo_tty => STDIN.tty? }
+    opts[:db] = task.opts[:db] if task.opts[:db]
+
+    command = create_mysql_command(opts)
+    Hem.logger.debug "mysql:console: #{command}"
+
+    Hem.ui.success "Connecting..." if STDOUT.tty?
+    exec command
+  end
+end

data/lib/hem/tasks/ops.rb

@@ -1,5 +1,6 @@
 namespace :ops do
-  task 'generate-self-signed-cert', [ 'domain' ] do |task, args|
+  argument 'domain'
+  task 'generate-self-signed-cert' do |task, args|
     cert = Hem::Lib::SelfSignedCertGenerator.generate args[:domain]
     puts "Key:\n#{cert[:key]}\nCert:\n#{cert[:cert]}\n"
   end

data/lib/hem/tasks/plugin.rb

@@ -0,0 +1,16 @@
+namespace :plugin do
+  desc "Install a project's defined Hemfile plugins"
+  task :install do
+    Hem.plugins.install
+  end
+
+  desc "Update a project's defined Hemfile plugins"
+  argument 'gems', optional: true, default: {}, as: Array
+  task :update do |t, args|
+    if args[:gems].empty?
+      Hem.plugins.update
+    else
+      Hem.plugins.update gems: args[:gems]
+    end
+  end
+end

data/lib/hem/tasks/redis.rb

@@ -0,0 +1,26 @@
+desc "Redis related commands"
+namespace :redis do
+  desc "Open a Redis cli connection"
+  task :cli do
+    opts = { :psuedo_tty => STDIN.tty? }
+
+    command = create_command("redis-cli", opts)
+    Hem.logger.debug "redis:cli: #{command}"
+
+    Hem.ui.success "Connecting..." if STDOUT.tty?
+    exec command
+  end
+
+  desc "Flush some or all redis dbs"
+  argument :dbs, optional: true, default: {}, as: Array
+  task :flush do |task, args|
+    if args[:dbs].empty?
+      run 'redis-cli FLUSHALL'
+    else
+      args[:dbs].each do |db|
+        Hem.ui.success "Flushing redis db #{db}" if STDOUT.tty?
+        shell create_command('redis-cli', auto_echo: true).pipe("SELECT #{db}\nFLUSHDB\n")
+      end
+    end
+  end
+end

data/lib/hem/tasks/seed.rb

@@ -9,7 +9,9 @@ namespace :seed do
   option '-b=', '--branch=', 'Seed branch to use'
   option '-d=', '--data=', 'Seed data to save to the project hem configuration', :as => Hash
 
-  task :plant, [ :name ] do |t, args|
+  argument 'name'
+
+  task :plant do |t, args|
     name = args[:name]
 
     Hem.project_path = File.join(Dir.pwd, name)
@@ -24,7 +26,7 @@ namespace :seed do
       :ref => t.opts[:branch] || 'master'
     }
 
-    seed_options = %w( default magento symfony custom )
+    seed_options = %w( default ezplatform magento1 magento2 spryker symfony plugin custom )
 
     seed_name = t.opts[:seed] || Hem.ui.ask_choice('Project seed', seed_options, default: 'default')
     use_short_seed_name = true

data/lib/hem/tasks/self.rb

@@ -20,10 +20,10 @@ namespace 'self'  do
     task "paths" do
       Hem.ui.info "<%=color('Project path:', :green)%> " + Hem.project_path
       {
-        :gemfile => "*Gemfile",
-        :vagrantfile => "*Vagrantfile",
-        :cheffile => "*Cheffile",
-        :berksfile => "*Berksfile",
+        :gemfile => "Gemfile",
+        :vagrantfile => "Vagrantfile",
+        :cheffile => "Cheffile",
+        :berksfile => "Berksfile",
         :'composer.json' => "composer.json"
       }.each do |k,v|
         path = nil
@@ -36,8 +36,9 @@ namespace 'self'  do
 
     desc "Locate"
     project_only
-    task "locate", [ :arg ] do |task, args|
-      locate args[:arg] do |file, full_file|
+    argument 'pattern', as: Array
+    task "locate" do |task, args|
+      locate '*', args[:pattern] do |file, full_file|
         puts full_file
       end
     end

data/lib/hem/tasks/tools.rb

@@ -8,7 +8,7 @@ namespace :tools do
     unless File.exists?(bin_file)
       Hem.ui.success "Getting composer"
       FileUtils.mkdir_p File.dirname(bin_file)
-      run_command "cd bin && php -r \"readfile('https://getcomposer.org/installer');\" | php", :realtime => true, :indent => 2
+      run "cd bin && php -r \"readfile('https://getcomposer.org/installer');\" | php", :realtime => true, :indent => 2
     else
       Hem.ui.success "Composer already available in bin/composer.phar"
     end

data/lib/hem/tasks/vm.rb

@@ -2,7 +2,7 @@ desc "VM related commands"
 project_only
 namespace :vm do
   def vagrantfile &block
-    locate "*Vagrantfile" do
+    locate "Vagrantfile" do
       yield
     end
   end
@@ -115,26 +115,18 @@ namespace :vm do
   desc "Open a MySQL cli connection"
   option '-D=', '--db=', 'Database'
   task :mysql do |task|
-    opts = { :psuedo_tty => STDIN.tty? }
-    opts[:db] = task.opts[:db] if task.opts[:db]
-
-    Hem.ui.success "Determining VM connection details..." if STDOUT.tty?
-    command = create_mysql_command(opts)
-    Hem.logger.debug "vm:mysql: #{command}"
+    Hem.ui.warning "hem vm mysql is deprecated, and will be removed in a future release."
+    Hem.ui.warning "Please use hem mysql console instead"
 
-    Hem.ui.success "Connecting..." if STDOUT.tty?
-    exec command
+    Rake::Task['mysql:console'].opts = task.opts
+    invoke 'mysql:console'
   end
 
   desc "Open a Redis cli connection"
   task :redis do
-    opts = { :psuedo_tty => STDIN.tty? }
-
-    Hem.ui.success "Determining VM connection details..." if STDOUT.tty?
-    command = create_command("redis-cli", opts)
-    Hem.logger.debug "vm:redis: #{command}"
+    Hem.ui.warning "hem vm redis is deprecated, and will be removed in a future release."
+    Hem.ui.warning "Please use hem redis cli instead"
 
-    Hem.ui.success "Connecting..." if STDOUT.tty?
-    exec command
+    invoke 'redis:console'
   end
 end

data/lib/hem/util.rb

@@ -34,7 +34,10 @@ module Hem
 
       case type
         when :update
-          @progress_bar_cache[file].progress += increment
+          @progress_bar_cache[file].progress = [
+            @progress_bar_cache[file].progress + increment,
+            total
+          ].min
         when :finished
           @progress_bar_cache[file].finish
       end
@@ -59,22 +62,9 @@ module Hem
       File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"]).match(/\/rvm\/|\/\.rvm\/|\/\.rbenv/) != nil
     end
 
-    def chefdk_compat
-      return if maybe(Hem.user_config.hem.disable_chefdk_compat) || ENV['HEM_DISABLE_CHEFDK_COMPAT']
-      return if Hem.windows?
-      which_ruby = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
-      if which_ruby =~ /rbenv/
-        split_path = ENV['PATH'].split ':'
-        paths = split_path.reject do |p|
-          p =~ /chefdk/
-        end
-        chef_paths = split_path - paths
-        ENV['PATH'] = (chef_paths + paths).join ':'
-      end
-    end
-
     def vagrant_plugin plugin, constraint = nil
-      return [plugin, constraint]
+      return [plugin, nil] if constraint.nil?
+      return [plugin, Gem::Dependency.new(plugin, constraint)]
     end
   end
 end

data/lib/hem/version.rb

@@ -1,3 +1,14 @@
 module Hem
-  VERSION = '1.0.1-beta6'
+  VERSION = '1.1.0'
+
+  class << self
+    def require_version *requirements
+      req = Gem::Requirement.new(*requirements)
+      if req.satisfied_by?(Gem::Version.new(VERSION))
+        return
+      end
+
+      raise HemVersionError.new(requirements)
+    end
+  end
 end

data/lib/hobo/tasks/magento.rb

@@ -1,3 +1,4 @@
 Hem.ui.warning 'require \'hobo/tasks/magento\' in Hobofile is deprecated, and will be removed in a future release.'
+HOBO_TASKS_MAGENTO_DEPRECATION=1
 
-require 'hem/tasks/magento'
+require_relative '../../hem/tasks/magento'

data/spec/hem/cli_spec.rb

@@ -14,6 +14,7 @@ describe Hem::Cli do
     end
 
     Hem.ui = double(Hem::Ui).as_null_object
+    Hem.plugins = double(Hem::Plugins).as_null_object
     help = double(Hem::HelpFormatter).as_null_object
     host_check = double(Hem::Lib::HostCheck).as_null_object
     cli = Hem::Cli.new help: help, host_check: host_check

data/spec/hem/helpers/argument_parser_spec.rb

@@ -0,0 +1,57 @@
+
+describe Hem::Helper do
+  describe "convert_args" do
+    it "should parse empty arguments" do
+      arg_list = {
+        'a' => {as: String, optional: false},
+        'b' => {as: String, optional: false},
+      }
+      expect(convert_args('my_task', [], {})).to eq([])
+    end
+
+    it "should parse mandatory arguments" do
+      arg_list = {
+        'a' => {as: String, optional: false},
+        'b' => {as: String, optional: false},
+      }
+      expect(convert_args('my_task', [1,2], arg_list)).to eq([1,2])
+    end
+
+    it "should parse optional arguments" do
+      arg_list = {
+        'a' => {as: String, optional: true},
+        'b' => {as: String, optional: true},
+      }
+      expect(convert_args('my_task', [1], arg_list)).to eq([1, nil])
+    end
+
+    it "should parse array arguments" do
+      arg_list = {
+        'a' => {as: Array},
+      }
+      expect(convert_args('my_task', [1,2,3], arg_list)).to eq([[1,2,3]])
+    end
+
+    it "should parse a optional string then a optional array" do
+      arg_list = {
+        'a' => {as: String, optional: true},
+        'b' => {as: Array, optional: true},
+      }
+      expect(convert_args('my_task', [1,2,3], arg_list)).to eq([1,[2,3]])
+    end
+
+    it "should throw exception on missing mandatory arguments" do
+      arg_list = {
+        'a' => {as: String, optional: false},
+      }
+      expect{convert_args('my_task', [], arg_list)}.to raise_error(Hem::MissingArgumentsError)
+    end
+
+    it "should throw exception if more input than arguments" do
+      arg_list = {
+        'a' => {as: String, optional: false},
+      }
+      expect{convert_args('my_task', [1,2], arg_list)}.to raise_error(Hem::InvalidCommandOrOpt)
+    end
+  end
+end

data/spec/hem/lib/seed/project_spec.rb

@@ -1,3 +1,4 @@
+require 'tmpdir'
 
 describe Hem::Lib::Seed::Project do
   pwd = nil

data/spec/hem/lib/seed/replacer_spec.rb

@@ -5,16 +5,17 @@ describe Hem::Lib::Seed::Replacer do
     Dir.mkdir("bin")
     Dir.mkdir("dir")
     {
-      "./test1" => "some {{test}} is here",
-      "./test2" => "no test is here",
-      "./dir/test" => "subdir {{test}}",
-      "./dir/nested" => "nested {{nested.test}}",
-      "./dir/no-utf" => "\xc2 {{test}}", # invalid utf should be skipped
-      "./bin/test" => "{{test}}" # bin/ should be ignored
+      "./test1.erb" => "some <%= config.test %> is here",
+      "./test2.erb" => "no test is here",
+      "./dir/test.erb" => "subdir <%= config.test %>",
+      "./dir/nested.erb" => "nested <%= config.nested.test %>",
+      "./dir/no-utf.erb" => "\xc2 <%= config.test %>", # invalid utf should be skipped
+      "./bin/test" => "<%= config.test %>" # non-ERB files should be ignored
     }.each do |name, content|
       File.write(name, content)
     end
 
+    Hem.project_config = DeepStruct.wrap({})
     @replacer = Hem::Lib::Seed::Replacer.new
   end
 
@@ -23,22 +24,20 @@ describe Hem::Lib::Seed::Replacer do
     FakeFS.deactivate!
   end
 
-  it "should respect exclude directories" do
-    files = @replacer.replace(".", { :test => 'badger' })
-    File.read("./bin/test").should eq "{{test}}"
+  it "should not replace non-ERB files" do
+    @replacer.replace(".", DeepStruct.wrap({ :test => 'badger' }))
+    File.read("./bin/test").should eq "<%= config.test %>"
   end
 
   it "should replace placeholders in files" do
-    files = @replacer.replace(".", { :test => 'badger' })
-    expect(files.sort).to eq(["./dir/test", "./test1"])
+    @replacer.replace(".", DeepStruct.wrap({ :test => 'badger' }))
 
     File.read("./test1").should eq "some badger is here"
     File.read("./dir/test").should eq "subdir badger"
   end
 
   it "should handle nested hashes" do
-    files = @replacer.replace(".", { :nested => { :test => 'nested' } })
-    expect(files.sort).to eq(["./dir/nested"])
+    @replacer.replace(".", DeepStruct.wrap({ :nested => { :test => 'nested' } }))
 
     File.read("./dir/nested").should eq "nested nested"
   end

data/spec/hem/lib/seed/seed_spec.rb

@@ -1,3 +1,4 @@
+require 'tmpdir'
 
 describe Hem::Lib::Seed::Seed do
   pwd = nil

metadata

@@ -1,172 +1,173 @@
 --- !ruby/object:Gem::Specification
 name: hem
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta6
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Simons
+- Andy Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.7
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: deepstruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.20
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.20
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
-  name: deepstruct
+  name: jmespath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: semantic
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: net-ssh-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.24
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
-  name: ruby-progressbar
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
-  name: teerb
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 11.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 11.1.2
 - !ruby/object:Gem::Dependency
-  name: net-ssh-simple
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: teerb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.0.1
 description: Inviqan toolbelt
 email:
-- msimons@inviqa.com
+- athompson@inviqa.com
 executables:
 - hem
 extensions: []
@@ -206,14 +207,13 @@ files:
 - lib/hem/error_handlers/friendly.rb
 - lib/hem/errors.rb
 - lib/hem/help_formatter.rb
+- lib/hem/helper/argument_parser.rb
 - lib/hem/helper/command.rb
 - lib/hem/helper/file_locator.rb
 - lib/hem/helper/github.rb
 - lib/hem/helper/http_download.rb
 - lib/hem/helper/shell.rb
 - lib/hem/helper/vm_command.rb
-- lib/hem/lib/github/api.rb
-- lib/hem/lib/github/client.rb
 - lib/hem/lib/host_check.rb
 - lib/hem/lib/host_check/deps.rb
 - lib/hem/lib/host_check/git.rb
@@ -227,6 +227,7 @@ files:
 - lib/hem/lib/seed/project.rb
 - lib/hem/lib/seed/replacer.rb
 - lib/hem/lib/seed/seed.rb
+- lib/hem/lib/seed/template.rb
 - lib/hem/lib/self_signed_cert_generator.rb
 - lib/hem/lib/vm/command.rb
 - lib/hem/lib/vm/inspector.rb
@@ -238,13 +239,18 @@ files:
 - lib/hem/patches/rubygems.rb
 - lib/hem/patches/slop.rb
 - lib/hem/paths.rb
+- lib/hem/plugins.rb
+- lib/hem/setup.rb
+- lib/hem/tasks.rb
 - lib/hem/tasks/assets.rb
 - lib/hem/tasks/config.rb
 - lib/hem/tasks/deps.rb
 - lib/hem/tasks/exec.rb
 - lib/hem/tasks/magento.rb
+- lib/hem/tasks/mysql.rb
 - lib/hem/tasks/ops.rb
-- lib/hem/tasks/pr.rb
+- lib/hem/tasks/plugin.rb
+- lib/hem/tasks/redis.rb
 - lib/hem/tasks/seed.rb
 - lib/hem/tasks/self.rb
 - lib/hem/tasks/shell_init.rb
@@ -263,6 +269,7 @@ files:
 - spec/hem/error_handlers/friendly_spec.rb
 - spec/hem/error_spec.rb
 - spec/hem/help_formatter_spec.rb
+- spec/hem/helpers/argument_parser_spec.rb
 - spec/hem/helpers/command_spec.rb
 - spec/hem/helpers/file_locator_spec.rb
 - spec/hem/helpers/github_spec.rb
@@ -296,12 +303,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Inviqan toolbelt
@@ -321,6 +328,7 @@ test_files:
 - spec/hem/error_handlers/friendly_spec.rb
 - spec/hem/error_spec.rb
 - spec/hem/help_formatter_spec.rb
+- spec/hem/helpers/argument_parser_spec.rb
 - spec/hem/helpers/command_spec.rb
 - spec/hem/helpers/file_locator_spec.rb
 - spec/hem/helpers/github_spec.rb