hem 1.0.1.beta6 → 1.1.0

data/lib/hem/error_handlers/debug.rb

@@ -3,7 +3,7 @@ module Hem
     class Debug
       include Hem::ErrorHandlers::ExitCodeMap
 
-      def handle error
+      def handle _, error
         Hem.ui.error "\n(#{error.class}) #{error.message}\n\n#{(error.backtrace || []).join("\n")}"
         return EXIT_CODES[error.class.to_s] || DEFAULT_EXIT_CODE
       end

data/lib/hem/error_handlers/friendly.rb

@@ -3,7 +3,7 @@ module Hem
     class Friendly
       include Hem::ErrorHandlers::ExitCodeMap
 
-      def handle error
+      def handle cli, error
         require 'tmpdir'
         log_file = File.join(Dir.tmpdir, 'hem_error.log')
 
@@ -27,10 +27,10 @@ module Hem
             ERROR
           when "Hem::InvalidCommandOrOpt"
             Hem.ui.error "\n#{error.message}"
-            Hem.ui.info error.cli.help_formatter.help if error.cli
+            Hem.ui.info cli.help_formatter.help
           when "Hem::MissingArgumentsError"
             Hem.ui.error "\n#{error.message}"
-            Hem.ui.info error.cli.help_formatter.help(target: error.command) if error.cli
+            Hem.ui.info cli.help_formatter.help(target: error.command)
           when "Hem::UserError"
             Hem.ui.error "\n#{error.message}\n"
           when "Hem::ProjectOnlyError"

data/lib/hem/errors.rb

@@ -2,6 +2,19 @@ module Hem
   class Error < StandardError
     attr_reader :exit_code
   end
+  
+  class HemVersionError < Error
+    def initialize requirements
+      super("
+This Hem project has specified that it requires the Hem
+version to satisfy the following version requirements:
+  #{requirements.join("\n")}
+You are running Hem #{VERSION}, which does not satisfy
+these requirements. Please upgrade Hem to the latest
+version, or relax the Hemfile's version constraints if
+you're already using the latest Hem version.")
+    end
+  end
 
   class RubyVersionError < Error
     def initialize
@@ -17,24 +30,28 @@ module Hem
   end
 
   class InvalidCommandOrOpt < Error
-    attr_accessor :command, :cli
-    def initialize command, cli = nil
+    attr_accessor :command
+    def initialize command
       @command = command
-      @cli = cli
       super("Invalid command or option specified: '#{command}'")
     end
   end
 
   class MissingArgumentsError < Error
-    attr_accessor :command, :cli
-    def initialize command, args, cli = nil
+    attr_accessor :command
+    def initialize command, args
       @command = command
       @args = args
-      @cli = cli
       super("Not enough arguments for #{command}")
     end
   end
 
+  class PluginsAlreadySetupError < Error
+    def initialize
+      super("Hem's plugins have already been set up. Additional plugins can't be defined after.")
+    end
+  end
+
   class ExternalCommandError < Error
     attr_accessor :command, :exit_code, :output
 
@@ -80,10 +97,4 @@ module Hem
       super('You need to define a preferred editor, either in your hem config or with the EDITOR environment variable')
     end
   end
-
-  class GithubAuthenticationError < Error
-  end
-
-  class GithubApiError < Error
-  end
 end

data/lib/hem/help_formatter.rb

@@ -91,16 +91,25 @@ module Hem
     def usage source, command = nil
       banner = source.banner
       if banner.nil?
-        arg_list = (source.arg_list || []).map do |arg|
-          "<#{arg}>"
+        arg_list = (source.arg_list || {}).map do |arg, options|
+          arg_text = "<#{arg}>"
+          if options[:as] == Array
+            arg_text = "#{arg_text}..."
+          end
+          if options[:optional]
+            arg_text = "[#{arg_text}]"
+          end
+          arg_text
         end
 
         banner = "#{File.basename($0, '.*')}"
         banner << " [command]" if source.commands.any? && command.nil?
         banner << " #{command.split(':').join(' ')}" if command
-        banner << " #{arg_list.join(' ')}" if arg_list.size > 0
         banner << " [options]"
+        banner << " #{arg_list.join(' ')}" if arg_list.size > 0
       end
+
+      banner
     end
 
     def section title, contents, align_to = false

data/lib/hem/helper/argument_parser.rb

@@ -0,0 +1,30 @@
+module Hem
+  module Helper
+    def convert_args task_name, args, arg_list
+      original_args = args.dup
+      task_args = []
+      arg_list.each do |_, options|
+        if args.empty?
+          if !options[:optional]
+            raise ::Hem::MissingArgumentsError.new(task_name, original_args)
+          else
+            task_args << options[:default]
+          end
+        elsif options[:as] == Array
+          task_args << args.dup
+          args.clear
+        else
+          task_args << args.shift
+        end
+      end
+
+      unless args.empty?
+        raise ::Hem::InvalidCommandOrOpt.new(args.join(' '))
+      end
+
+      task_args
+    end
+  end
+end
+
+include Hem::Helper

data/lib/hem/helper/command.rb

@@ -11,9 +11,10 @@ module Hem
       end
     end
 
-    def run_command command, opts = {}
+    def run command, opts = {}
       create_command(command, opts).run
     end
+    alias_method :run_command, :run
 
     def create_mysql_command opts = {}
       opts = {

data/lib/hem/helper/file_locator.rb

@@ -1,10 +1,27 @@
 module Hem
   module Helper
-    def locate(pattern, opts = {}, &block)
+    extend self
+
+    def locate(name, patterns = nil, opts = {}, &block)
+      opts = {
+        type: 'git',
+        patterns: patterns || [name, "**/#{name}"],
+        path: Hem.project_path,
+      }.merge(opts)
+
       match = nil
 
-      Dir.chdir Hem.project_path do
-        match = locate_git(pattern, &block)
+      unless Hem.project_config[:locate].nil? || Hem.project_config[:locate][name].nil?
+        opts = opts.merge(Hem.project_config[:locate][name].to_hash_sym)
+      end
+
+      Dir.chdir opts[:path] do
+        case opts[:type]
+        when 'git'
+          match = locate_git(opts[:patterns], &block)
+        when 'files'
+          match = locate_files(opts[:patterns], &block)
+        end
       end
 
       return match unless block_given?
@@ -16,20 +33,30 @@ module Hem
 
     private
 
-    def locate_git pattern, &block
-      args = [ 'git', 'ls-files', pattern ]
+    def locate_files patterns, &block
+      paths = patterns.inject([]) do |result, pattern|
+        result + Dir.glob(pattern)
+      end
+      locate_loop paths, &block
+    end
+
+    def locate_git patterns, &block
+      args = [ 'git', 'ls-files', *patterns ]
       output = Hem::Helper.shell *args, :capture => true
       paths = output.split("\n")
-      found = false
       paths.each do |path|
         path.strip!
       end
+      locate_loop paths, &block
+    end
 
+    def locate_loop paths, &block
       return paths unless block_given?
 
+      found = false
       paths.each do |path|
         Dir.chdir File.dirname(path) do
-          Hem::Logging.logger.debug "helper.locator: Found #{path} for #{pattern}"
+          Hem::Logging.logger.debug "helper.locator: Found #{path}"
           yield File.basename(path), path
         end
 

data/lib/hem/helper/shell.rb

@@ -49,7 +49,6 @@ module Hem
 
       require 'bundler'
       ::Bundler.with_clean_env do
-        Hem.chefdk_compat
         indent = " " * opts[:indent]
         ::Open3.popen3 opts[:env], *args do |stdin, out, err, external|
           buffer = ::Tempfile.new 'hem_run_buf'

data/lib/hem/helper/vm_command.rb

@@ -1,9 +1,9 @@
 module Hem
   module Helper
     def vm_shell command, opts = {}
-      Hem.ui.warning "Using vm_shell is deprecated and will be removed in a future release. Please use run_command instead"
+      Hem.ui.warning "Using vm_shell is deprecated and will be removed in a future release. Please use run instead"
       opts['run_environment'] = 'vm'
-      run_command command, opts
+      run command, opts
     end
 
     def vm_mysql opts = {}

data/lib/hem/lib/host_check/vagrant.rb

@@ -2,14 +2,13 @@ module Hem
   module Lib
     module HostCheck
       def vagrant_version opts
-        require 'semantic'
         begin
           return unless get_run_environment == 'vm'
 
           version = shell "vagrant --version", :capture => true
           version.gsub!(/^Vagrant[^0-9]+/, '')
-          version = ::Semantic::Version.new version.strip
-          minimum_version = ::Semantic::Version.new "1.3.5"
+          version = Gem::Version.new(version.strip) 
+          minimum_version = Gem::Version.new("1.3.5")
 
           advice = <<-EOF
   The version of vagrant which you are using (#{version}) is less than the minimum required (#{minimum_version}).

data/lib/hem/lib/s3/sync.rb

@@ -101,11 +101,11 @@ module Hem
             # We allow this one to be skipped as there are obviously no assets to sync
           rescue Aws::S3::Errors::AccessDenied
             Hem.ui.error "  Your AWS key does not have access to the #{Hem.project_config.asset_bucket} S3 bucket!"
-            Hem.ui.error "  Please request access to this bucket from your TTL or via an internal support request"
+            Hem.ui.error "  Please request access to this bucket from your Amazon AWS account administrators"
             raise exception
           rescue Aws::Errors::MissingCredentialsError
             Hem.ui.warning "  AWS credentials not set!"
-            Hem.ui.warning "  Please request credentials from internalsupport@inviqa.com or in #devops and configure them with `hem config`"
+            Hem.ui.warning "  Please request credentials from your Amazon AWS account administrators and configure them with `hem config`"
             raise exception
           end
         end

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

@@ -6,8 +6,8 @@ module Hem
           @opts = {
             :replacer => Replacer.new,
             :config_class => Hem::Config::File,
-            :ssl_cert_generator => Hem::Lib::SelfSignedCertGenerator
           }.merge! opts
+          @replace_done = false
         end
 
         def setup seed, config
@@ -17,27 +17,24 @@ module Hem
           seed.export project_path, config
 
           Dir.chdir(project_path) do
-            Hem.detect_project_type project_path
-            @opts[:project_config_file] = Hem.project_config_file
-
             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
+            config[:tmp] = {}
 
-            @opts[:replacer].replace(config[:project_path], config)
+            Hem.project_path = project_path
             load_seed_init(config)
 
+            @opts[:replacer].replace(config[:project_path], Hem.project_config)
+
             config.delete :project_path
-            config.delete :ssl
-            config.delete :chef_ssl
+            config.delete :tmp
+
+            Hem.detect_project_type project_path
+            @opts[:project_config_file] = Hem.project_config_file
             @opts[:config_class].save @opts[:project_config_file], config
           end
 
@@ -50,7 +47,7 @@ module Hem
           Hem.project_config = DeepStruct.wrap(config)
           seed_init_file = File.join(config[:project_path], 'seedinit.rb')
           if File.exists?(seed_init_file)
-            require seed_init_file
+            instance_eval File.read(seed_init_file), seed_init_file
             File.unlink(seed_init_file)
           end
         end

data/lib/hem/lib/seed/replacer.rb

@@ -2,14 +2,9 @@ module Hem
   module Lib
     module Seed
       class Replacer
-        # Matching files/directories to be excluded from replacements
-        EXCLUDES = ["\\.git/", "^./bin", "^./lib", "^./spec"]
-
         def replace(path, tokens)
-          if tokens.instance_of? Hash
-            tokens = flat_hash(tokens)
-          elsif !tokens.instance_of? Array
-            raise "Invalid token list (expected Array or Hash)"
+          unless !tokens.instance_of?(Hash)
+            raise "Invalid token list (expected Hash)"
           end
 
           return search_replace(path, tokens)
@@ -18,36 +13,19 @@ module Hem
         private
 
         def search_replace(path, tokens, &block)
-          require 'find'
-          files = []
-          excludes = Regexp.new(EXCLUDES.join("|"))
-          Find.find(path) do |candidate|
-            Find.prune if candidate =~ excludes  # Skip excluded
+          require 'erb'
+
+          template = Template.new(tokens)
+          Hem::Helper.locate('*.erb', nil, path: path, type: 'files').each do |candidate|
             next unless FileTest.file? candidate # Skip unless file
 
             content = File.read(candidate)
             next unless content.force_encoding("UTF-8").valid_encoding? # Skip unless file can be valid UTF-8
 
-            match = false
-            tokens.each do |token, replacement|
-              token = "{{#{token.join('.')}}}"
-              match = content.match(token)
-              if match
-                content.gsub!(token, replacement)
-                files.push(candidate)
-              end
-            end
-
-            File.write(candidate, content) if files.include? candidate
-          end
-          return files.uniq
-        end
+            content = template.render(content, candidate)
 
-        # http://stackoverflow.com/questions/9647997/converting-a-nested-hash-into-a-flat-hash
-        def flat_hash(hash, k = [])
-          return {k => hash} unless hash.is_a?(Hash)
-          hash.inject({}) do |h, v|
-            h.merge! flat_hash(v[-1], k + [v[0]])
+            File.delete(candidate)
+            File.write(candidate.sub('.erb', ''), content)
           end
         end
       end

data/lib/hem/lib/seed/template.rb

@@ -0,0 +1,21 @@
+module Hem
+  module Lib
+    module Seed
+      class Template
+        def initialize(config)
+          @config = config
+        end
+
+        def config
+          @config
+        end
+
+        def render(content, filename)
+          erb = ERB.new(content)
+          erb.filename = filename
+          erb.result binding
+        end
+      end
+    end
+  end
+end

data/lib/hem/lib/vm/inspector.rb

@@ -45,7 +45,7 @@ module Hem
         def ssh_config
           return @ssh_config if @ssh_config
           config = nil
-          locate "*Vagrantfile" do
+          locate "Vagrantfile" do |_, file|
             config = shell "vagrant ssh-config", :capture => true
           end
 

data/lib/hem/patches/deepstruct.rb

@@ -17,5 +17,9 @@ module DeepStruct
         Hem::Null.new
       end
     end
+
+    def to_hash_sym
+      unwrap.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+    end
   end
 end