app_stack 1.3.0 → 1.3.3

data/app_stack.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new 'app_stack', AppStack::VERSION do |s|
   s.add_dependency 'tilt', '>= 1.4.1'
   s.add_dependency 'term-ansicolor', '>= 1.2.2'
   s.add_dependency 'activesupport', '>= 3.2.14'
+  s.add_dependency 'diffy'
   s.add_development_dependency 'rspec', '>= 2.14.1'
   s.add_development_dependency 'simplecov', '>= 0.7.1'
 end

data/lib/app_stack/copy_list_builder.rb

@@ -124,7 +124,7 @@ module AppStack
       target_dir = File.dirname(to)
       FileUtils.mkdir_p target_dir unless File.directory?(target_dir)
       puts "copied #{fr.blue} \n   to: " + to.green.bold
-      FileUtils.copy fr, to
+      FileUtils.cp_r fr, to
     end
 
     def render_file!(fr, to)

data/lib/app_stack/stack_app.rb

@@ -87,9 +87,14 @@ module AppStack
 
       # add local template files the copy list
       Dir[directory + "/**/*{#{@config[:tpl_ext].join(',')}}"].each do |f|
-        @copy_list['r:' + f] = f.gsub(/#{@config[:tpl_ext].join('|')}$/, '')
-        echo 'found local template file: ',
-             short_path(f) + ' -> ' + short_path(@copy_list['r:' + f])
+        of = f.gsub(/#{@config[:tpl_ext].join('|')}$/, '')
+        if File.exists?(of)
+          @copy_list['r:' + f] = of
+          echo 'found local template file: ',
+               short_path(f) + ' -> ' + short_path(of)
+        else
+          echo 'skip template file: ', f
+        end
       end
 
       merge!

data/lib/app_stack/version.rb

@@ -2,5 +2,5 @@
 
 # AppStack module
 module AppStack
-  VERSION = '1.3.0'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.3
+  prerelease: 
 platform: ruby
 authors:
 - Huang Wei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,13 +54,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.14
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -99,7 +126,6 @@ files:
 - lib/app_stack/cli_options.rb
 - lib/app_stack/copy_list_builder.rb
 - lib/app_stack/local_files_parser.rb
-- lib/app_stack/merger.rb
 - lib/app_stack/stack_app.rb
 - lib/app_stack/version.rb
 - spec/config_spec.rb
@@ -146,26 +172,27 @@ files:
 homepage: https://github.com/7lime/app_stack-gem
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Use as a rake task, define a stack of modules and app-stack will merge files
   from those stack-apps to the local application directory.
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTJmNjU5OThhNjgwMjg5MzJjZGVmNjQ2MGU2ZTkzMDNkZGY0NGM5NQ==
-  data.tar.gz: !binary |-
-    ZTA1ODI2N2RlM2U3MTNiZmFkM2NjMmI5ZTdhNWU5NzRiNTE1NDhlMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzAzMmQ5YzEwNWIzZTI3MDk1MmE1MzMzOWZhOGQ5YWFkMWNkZTJhY2E5OGJl
-    ZjgwOTNiZGRhYjY2MWM3MDdmMGRjOWNmYTVhYjg5ZDE4NGIzMmI0NTNmMTA1
-    ZTUwMWFhZDNkMTg5MzAyYjdmYmMzOTI4ZGUyM2QxYWIyMDk1NTI=
-  data.tar.gz: !binary |-
-    MjVjNDgwNmE1OWQ2YTlhODZhZDgxNDYzZGM4ZGY3YzQ4MjdjMDE5NmNkNTdh
-    NWY2ZWNiYzViYmRmNDkzNTA4MGM2NmU1ZDM2N2RlMDk4OTM5ZWY2MTFkZTI4
-    OWNmNWJjNjk3NDYwYjYxYWUxZGNlNzk0ZDdjZjc0NmRmZTEwN2E=

data/lib/app_stack/merger.rb

@@ -1,136 +0,0 @@
-# encoding: utf-8
-
-module AppStack
-  # runner for merge files from stack of apps
-  class Merger
-    attr_reader :stacks, :copy_list, :render_list
-
-    def initialize(conf_file, verbose = false)
-      # load configuration
-      @conf_file = conf_file
-      @config = Config.new(@conf_file)
-      @verbose = verbose
-
-      @stacks = []
-      @attr_vars = {}
-      @attr_last_mod = File.mtime(@conf_file)
-      parse_stacks
-
-      @copy_list = {}
-      @render_list = {}
-      @prepared = false
-    end
-
-    def prepare(verbose = false)
-      local_dir = Pathname.new(@config.directory)
-      @stacks.each do |stack|
-        stack.copy_list.each do |fr, to| # copy from, copy to
-          to = local_dir + to.gsub(/^\//, '')
-          if @config.exclude_files[to.to_s]
-            puts 'keep '.green.bold + to.to_s.gsub(@config.stack_dir, '') if verbose
-          elsif newer?(to, fr)
-            puts 'skip '.white.bold + to.to_s.gsub(@config.stack_dir, '') if verbose
-          else
-            # render list
-            tpl_file = nil
-            @config.tpl_ext.each { |ext| tpl_file = fr + ext if File.exists?(fr + ext) }
-
-            if tpl_file
-              @render_list[to.to_s] = tpl_file if newer?(tpl_file, to) || attr_mod?(to)
-            else
-              @copy_list[to.to_s] = fr if newer?(fr, to)
-            end
-          end
-        end
-      end
-
-      # render local templates
-      Find.find(@config.directory) do |fr|
-        next if File.directory? fr
-        tpl_file = nil
-        @config.tpl_ext.each { |ext| tpl_file = fr + ext if File.exists?(fr + ext) }
-        if tpl_file
-          @render_list[fr] = tpl_file if newer?(tpl_file, fr) || attr_mod?(fr)
-        end
-      end
-
-      if verbose
-        @copy_list.each do |to, fr|
-          puts 'copy '.bold + fr.gsub(@config.stack_dir, '')
-          puts '  to '.bold + to.to_s.gsub(@config.stack_dir, '')
-        end
-
-        @render_list.each do |to, fr|
-          puts 'render '.bold + fr.gsub(@config.stack_dir, '')
-          puts '    to '.bold + to.to_s.gsub(@config.stack_dir, '')
-        end
-      end
-
-      @prepared = true
-    end
-
-    def merge!
-      @prepared || prepare(@verbose)
-      @copy_list.each { |to, fr| copy_file!(fr, to) }
-      @render_list.each { |to, fr| render_file!(fr, to) }
-    end
-
-    private
-
-    def copy_file!(fr, to)
-      target_dir = File.dirname(to)
-      FileUtils.mkdir_p target_dir unless File.directory?(target_dir)
-      FileUtils.copy fr, to
-    end
-
-    def render_file!(fr, to)
-      var = @attr_vars.deep_merge(@config.attr_vars)
-      oh = File.open(to, 'wb')
-      if fr.match(/\.liquid$/)
-        require 'liquid'
-        oh.write Liquid::Template.parse(File.open(fr, 'r:utf-8').read).render(var)
-      else
-        tilt = Tilt.new(fr)
-        oh.write tilt.render(OpenStruct.new(var))
-      end
-      oh.close
-    end
-
-    # get a list of stacked app object
-    def parse_stacks
-      @config.stack.each do |stk|
-        case
-        when stk.is_a?(String) then @stacks << load_stack(stk, ['default'])
-        when stk.is_a?(Hash)
-          stk.each { |key, groups| @stacks << load_stack(key, groups) }
-        else
-          raise 'stack must be a string or a hash, in ' + @conf_file
-        end
-      end
-    end
-
-    # read stack from list, set copy_list
-    def load_stack(stack_name, groups)
-      conf_base_name = File.basename(@conf_file)
-      stack_dir = Pathname.new(@config.stack_dir) + stack_name
-      stack = Config.new(stack_dir + conf_base_name)
-      fmodtime = File.mtime(stack_dir + conf_base_name)
-      @attr_last_mod = fmodtime if fmodtime > @attr_last_mod # update file mod time
-      @attr_vars = @attr_vars.deep_merge stack.attr_vars
-      groups.each { |grp| stack.add_copy_list(grp) }
-      stack
-    end
-
-    # if f1 newer than f2, or f2 not exits but f1 does.
-    def newer?(f1, f2)
-      return false unless File.exists?(f1)
-      return true unless File.exists?(f2)
-      File.mtime(f1) > File.mtime(f2)
-    end
-
-    def attr_mod?(to)
-      return true unless File.exists?(to)
-      @attr_last_mod > File.mtime(to)
-    end
-  end
-end