hem 1.0.1.beta2 → 1.0.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44495fc9c4a95ad2036264a9fbe126f0db119ca
-  data.tar.gz: d52eb3e5b8abdeb52a5db03c3704c1d6e5f4804e
+  metadata.gz: e24a451f5acc1defa6a9387d956e907929a5f7ea
+  data.tar.gz: 5b1841273e1dd1ac7845c5aa56476f2341dcce7c
 SHA512:
-  metadata.gz: b028dd6c290e07aa872660eecd4c8f5091f8e49829bbe8a52b947a03a7db66476cff4ab8bfc18c7ef0ad23b3383f30643280ea797523d0598a883b87618ecb33
-  data.tar.gz: eed7903da8c98062cefe33c7a0b5fd21b6eadb37a6cf6e11bdf8d051df56922415d34cfde2c0a9a59c8a309769554bf848e20390b8c5d3e97ead0dbf15db4491
+  metadata.gz: a84691eb109695fb6bcd95dbd9a204109fc7ac1a23978c5124ebe03c2a8670f9cb798a8e589e952fd4b52c0c005df9967aea7fb051fbcb7a9f195caace93947e
+  data.tar.gz: c18bb3bafa2689768e5bad00541ef6c983f3a23c6d65d2323bc42dec4deaf04fea3bf6a51566451c3019520741160cde192b336d5e0344fc06ade253019a3e12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hem (1.0.1.beta2)
+    hem (1.0.1.beta3)
       aws-sdk (~> 2.0.24)
       deepstruct (~> 0.0.5)
       highline (~> 1.6.20)

data/lib/hem/lib/seed/project.rb

@@ -6,34 +6,40 @@ module Hem
           @opts = {
             :replacer => Replacer.new,
             :config_class => Hem::Config::File,
-            :project_config_file => Hem.project_config_file,
             :ssl_cert_generator => Hem::Lib::SelfSignedCertGenerator
           }.merge! opts
         end
 
         def setup seed, config
+          project_path = config[:project_path]
+
           seed.update
-          seed.export config[:project_path], config
-          config[:seed][:version] = seed.version
-          config[:hostname] = "#{config[:name]}.dev"
-          config[:asset_bucket] = "inviqa-assets-#{config[:name]}"
-          config[:vm] = {
-            :project_mount_path => "/vagrant"
-          }
-          config[:ssl] = @opts[:ssl_cert_generator].generate config[:hostname]
-          config[:chef_ssl] = {}
-          config[:ssl].each do |k, v|
-            config[:chef_ssl][k] = v.gsub("\n", "\\n")
-          end
+          seed.export project_path, config
 
-          @opts[:replacer].replace(config[:project_path], config)
-          load_seed_init(config)
+          Dir.chdir(project_path) do
+            Hem.detect_project_type project_path
+            @opts[:project_config_file] = Hem.project_config_file
 
-          project_path = config[:project_path]
-          config.delete :project_path
-          config.delete :ssl
-          config.delete :chef_ssl
-          @opts[:config_class].save @opts[:project_config_file], config
+            config[:seed][:version] = seed.version
+            config[:hostname] = "#{config[:name]}.dev"
+            config[:asset_bucket] = "inviqa-assets-#{config[:name]}"
+            config[:vm] = {
+              :project_mount_path => "/vagrant"
+            }
+            config[:ssl] = @opts[:ssl_cert_generator].generate config[:hostname]
+            config[:chef_ssl] = {}
+            config[:ssl].each do |k, v|
+              config[:chef_ssl][k] = v.gsub("\n", "\\n")
+            end
+
+            @opts[:replacer].replace(config[:project_path], config)
+            load_seed_init(config)
+
+            config.delete :project_path
+            config.delete :ssl
+            config.delete :chef_ssl
+            @opts[:config_class].save @opts[:project_config_file], config
+          end
 
           initialize_git project_path, config[:git_url]
         end

data/lib/hem/paths.rb

@@ -12,8 +12,9 @@ module Hem
       File.join(config_path, 'seeds')
     end
 
-    def detect_project_type
-      return unless @project_type.nil?
+    def detect_project_type limit_path = nil
+      @project_type = 'Hem'
+      @project_path = nil
 
       searches = [
         { type: "Hem", indicators: [ "Hemfile", "tools/hem"] },
@@ -21,21 +22,15 @@ module Hem
         { type: "Hem", indicators: ["tools/vagrant/Vagrantfile"] }
       ]
 
-      searches.each do |search|
-        next if @project_path
-        path = project_path_compat search
-        if path
-          @project_type = search[:type]
-          @project_path = path
-          break
-        end
+      match = project_path_compat searches, limit_path
+      if match
+        @project_type = match[:type]
+        @project_path = match[:path]
       end
-
-      @project_type ||= 'Hem'
     end
 
     def project_dsl_type
-      detect_project_type
+      detect_project_type if @project_type.nil?
       @project_type
     end
 
@@ -44,26 +39,30 @@ module Hem
     end
 
     def project_path
-      detect_project_type
+      detect_project_type if @project_type.nil?
       @project_path
     end
 
-    def project_path_compat search
+    def project_path_compat searches, limit_path = nil
       dir = Dir.pwd.split('/').reverse
       min_length = Gem.win_platform? ? 1 : 0
       Hem::Logging.logger.debug("paths.project: Searching backwards from #{Dir.pwd}")
 
       while dir.length > min_length
         test_dir = dir.reverse.join('/')
+        return nil unless limit_path.nil? || test_dir.start_with?(limit_path)
+
         Hem::Logging.logger.debug("paths.project: Testing #{test_dir}")
 
-        results = search[:indicators].map do |s|
-          File.exists?(File.join(test_dir, s))
-        end
+        searches.each do |search|
+          results = search[:indicators].map do |s|
+            File.exists?(File.join(test_dir, s))
+          end
 
-        match = results - [false]
+          match = results - [false]
 
-        return test_dir if match.length > 0
+          return {type: search[:type], path: test_dir} if match.length > 0
+        end
 
         dir.shift
       end

data/lib/hem/tasks/deps.rb

@@ -5,10 +5,18 @@ namespace :deps do
   desc "Install Gem dependencies"
   task :gems do
     locate "*Gemfile" do
-      required = shell("bundle", "check", :exit_status => true) != 0
+      required = shell("bundle check", :exit_status => true) != 0
       if required
         Hem.ui.title "Installing Gem dependencies"
-        shell "bundle", "install", realtime: true, indent: 2
+
+        bundler_args = "#{Hem.user_config.bundler_args} #{Hem.project_config.bundler_args}".strip
+
+        command = [
+          'bundle install',
+           bundler_args.empty? ? nil : bundler_args
+        ].compact.join(' ')
+
+        shell command, realtime: true, indent: 2
         Hem.ui.separator
       end
     end
@@ -50,24 +58,35 @@ namespace :deps do
 
   desc "Install vagrant plugins"
   task :vagrant_plugins => [ "deps:gems" ] do
+    require 'semantic'
     plugins = shell "vagrant plugin list", :capture => true
     locate "*Vagrantfile" do
-      to_install = []
+      to_install = {}
       File.read("Vagrantfile").split("\n").each do |line|
-        if line.match /#\s*Hem.vagrant_plugin (.*)/ or line.match /#\s*Hobo.vagrant_plugin (.*)/
-          to_install << $1
+        if line.match(/#\s*(?:Hem|Hobo)\.(vagrant_plugin.*)/)
+          to_install.merge! Hash[[eval("Hem.#{$1}")]]
         else
           next if line.match /^\s*#/
           next unless line.match /Vagrant\.require_plugin (.*)/
-          to_install << $1
+          to_install[$1.gsub(/['"]*/, '')] = nil
         end
       end
 
-      to_install.each do |plugin|
-        plugin.gsub!(/['"]*/, '')
-        next if plugins.include? "#{plugin} "
-        Hem.ui.title "Installing vagrant plugin: #{plugin}"
-        shell "vagrant", "plugin", "install", plugin, :realtime => true, :indent => 2
+      plugins = Hash[
+        plugins.scan(/^([^\s]+)\s+\(([^,\)]+)(?:,[^\)]+)?\)$/).map do |plugin, version|
+          [plugin, Semantic::Version.new(version)]
+        end
+      ]
+
+      to_install.each do |plugin, constraint|
+        next if plugins.has_key?(plugin) && (constraint.nil? || plugins[plugin].satisfies(constraint))
+        Hem.ui.title "Installing vagrant plugin: #{plugin}#{constraint && " #{constraint}"}"
+        args = ["vagrant", "plugin", "install", plugin]
+        if constraint
+          args << '--plugin-version'
+          args << constraint
+        end
+        shell *args, :realtime => true, :indent => 2
         Hem.ui.separator
       end
     end

data/lib/hem/util.rb

@@ -72,5 +72,9 @@ module Hem
         ENV['PATH'] = (chef_paths + paths).join ':'
       end
     end
+
+    def vagrant_plugin plugin, constraint = nil
+      return [plugin, constraint]
+    end
   end
 end

data/lib/hem/version.rb

@@ -1,3 +1,3 @@
 module Hem
-  VERSION = '1.0.1-beta2'
+  VERSION = '1.0.1-beta3'
 end

data/spec/hem/helpers/command_spec.rb

@@ -72,7 +72,6 @@ describe Hem::Helper do
     it "should enable auto echo of piped commands" do
       c = create_mysql_command(:pwd => '/')
       c << "SELECT 1"
-      puts c.to_s
       c.to_s.should match /echo\\ SELECT\\\\\\\\\\ 1\\ \\\|/
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hem
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta2
+  version: 1.0.1.beta3
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop