hem 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce0720a2204325f9c039e61d06f4f22beab37db
-  data.tar.gz: 619aad110e585018fad30f2e54f22473aca10e7d
+  metadata.gz: 9c2214ffe026377c966275a58d880aa25252d40c
+  data.tar.gz: 68652bf1eb37edbee90647547321376e2bfa3340
 SHA512:
-  metadata.gz: 859e56bd09b826fc401ca9024cd5deb29dec7da0a0c5064df4457804ffee772b36d3c769828fb056434228f7937028e3dd402dddaaedd65f2af99b6a3dfb4769
-  data.tar.gz: 182c906fede71dd021565ef39b83937fee8f4a6da160bb1660bde2ef1020458ffaff3121905f2fc71fc0f1ddf3eb2f001d66c630b2cb53e10fa15a8d7a905847
+  metadata.gz: 3bf49d38642adc775fdf1077af834d27a655a89fe396344ae600bb29165db708758b8293e310684232c64fc16d13f44aa424428a41fbe500e740161d3cb861cf
+  data.tar.gz: c5348d734c3689b91e5312633d08b8ec9497411c57a6e381e5d559d91b78028b742c45b96134de1f841566ab2462cda600c5293bbb6963efe07bc5786af63301

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hem (1.1.2)
+    hem (1.2.0)
       aws-sdk (~> 2.3.8)
       deepstruct (~> 0.0.7)
       highline (~> 1.7.3)

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

@@ -6,29 +6,31 @@ module Hem
           @opts = {
             :replacer => Replacer.new,
             :config_class => Hem::Config::File,
+            :template_excludes => [],
           }.merge! opts
           @replace_done = false
         end
 
         def setup seed, config
-          project_path = config[:project_path]
+          config = DeepStruct.wrap(config)
+          project_path = config.project_path
 
           seed.update
           seed.export project_path, config
 
           Dir.chdir(project_path) do
-            config[:seed][:version] = seed.version
-            config[:hostname] = "#{config[:name]}.dev"
-            config[:asset_bucket] = "inviqa-assets-#{config[:name]}"
-            config[:vm] = {
+            config.seed.version = seed.version
+            config.hostname = "#{config.name}.dev"
+            config.asset_bucket = "inviqa-assets-#{config.name}"
+            config.vm = {
               :project_mount_path => "/vagrant"
             }
-            config[:tmp] = {}
+            config.tmp = {}
 
             Hem.project_path = project_path
             load_seed_init(config)
 
-            @opts[:replacer].replace(config[:project_path], Hem.project_config)
+            @opts[:replacer].replace(project_path, config)
 
             config.delete :project_path
             config.delete :tmp
@@ -43,9 +45,17 @@ module Hem
 
         private
 
+        def config
+          Hem.project_config
+        end
+
+        def option key, value
+          @opts[key] = value
+        end
+
         def load_seed_init config
-          Hem.project_config = DeepStruct.wrap(config)
-          seed_init_file = File.join(config[:project_path], 'seedinit.rb')
+          Hem.project_config = config
+          seed_init_file = File.join(config.project_path, 'seedinit.rb')
           if File.exists?(seed_init_file)
             instance_eval File.read(seed_init_file), seed_init_file
             File.unlink(seed_init_file)

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

@@ -2,22 +2,23 @@ module Hem
   module Lib
     module Seed
       class Replacer
-        def replace(path, tokens)
+        def replace(path, tokens, excludes = [])
           unless !tokens.instance_of?(Hash)
             raise "Invalid token list (expected Hash)"
           end
 
-          return search_replace(path, tokens)
+          return search_replace(path, tokens, excludes)
         end
 
         private
 
-        def search_replace(path, tokens, &block)
+        def search_replace(path, tokens, excludes = [])
           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
+            next unless excludes.select { |exclude| File.fnmatch?(exclude, candidate) }.empty?
 
             content = File.read(candidate)
             next unless content.force_encoding("UTF-8").valid_encoding? # Skip unless file can be valid UTF-8

data/lib/hem/paths.rb

@@ -3,12 +3,15 @@ module Hem
     attr_accessor :project_path
 
     def config_path
-      config_paths = [ File.join(ENV['HOME'], '.hem'), File.join(ENV['HOME'], '.hobo') ]
-      config_paths.each do |path|
-        return path if File.exists? File.join(path, 'config.yaml')
-      end
+      @config_path ||= begin
+        config_paths = [ File.join(ENV['HOME'], '.hem'), File.join(ENV['HOME'], '.hobo') ]
+        config_paths.each do |path|
+          return path if File.exists? File.join(path, 'config.yaml')
+        end
 
-      return config_paths.first
+        FileUtils.mkdir_p(config_paths.first)
+        config_paths.first
+      end
     end
 
     def seed_cache_path

data/lib/hem/setup.rb

@@ -7,7 +7,11 @@ end
 require_relative 'version'
 require_relative 'plugins'
 
-gem 'hem', Hem::VERSION unless ENV['HEM_OMNIBUS']
+if ENV['HEM_OMNIBUS']
+  $:.push File.expand_path(File.join("..", ".."), __FILE__)
+else
+  gem 'hem', Hem::VERSION
+end
 
 require 'bundler'
 require 'hem'

data/lib/hem/version.rb

@@ -1,5 +1,5 @@
 module Hem
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 
   class << self
     def require_version *requirements

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

@@ -1,16 +1,24 @@
+OldFile = File
 
 describe Hem::Lib::Seed::Replacer do
   before do
     FakeFS.activate!
-    Dir.mkdir("bin")
-    Dir.mkdir("dir")
+    def File.fnmatch?(pattern, path)
+      OldFile.fnmatch?(pattern, path)
+    end
+
+    Dir.mkdir('/project')
+    Dir.mkdir('/project/bin')
+    Dir.mkdir('/project/dir')
+    Dir.chdir('/project')
+
     {
-      "./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
+      "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
@@ -41,4 +49,12 @@ describe Hem::Lib::Seed::Replacer do
 
     File.read("./dir/nested").should eq "nested nested"
   end
+  
+  it "should exclude excluded patterns" do
+    @replacer.replace(".", DeepStruct.wrap({ :test => 'badger' }), ['dir/**'])
+
+    File.read("./test1").should eq "some badger is here"
+    File.read("./dir/test.erb").should eq "subdir <%= config.test %>"
+    File.exist?("./dir/test").should be_false
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hem
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Simons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk