app_stack 1.3.3 → 1.3.4

data/lib/app_stack/copy_list_builder.rb

@@ -65,7 +65,7 @@ module AppStack
       @copy_candidates.each do |t, f|
         if File.exists?(t)
           diff = Diffy::Diff.new(f, t, :source => 'files')
-          if diff
+          if diff.to_s.chomp.size > 0
             @diffs[t] = diff
             @copy_files[t] = f
           else
@@ -84,7 +84,7 @@ module AppStack
       echo 'final diff list: ', @diffs
       echo 'final render lists: ', @render_files
 
-      if @diffs.keys.size > 0
+      if @diffs.keys.size > 0 and !@options.force
         ask_diffs # quit, copy and show diffs special files
       else
         do_copy!
@@ -99,9 +99,10 @@ module AppStack
         puts "[#{i.to_s.bold}] " + short_path(t).blue
         puts "from: #{@copy_files[t].blue}"
         puts diff.to_s(:color)
+        i += 1
       end
 
-      puts "use -f (--option) option to overwrite all files,"
+      puts "use -f (--force) option to overwrite all files,"
       puts "or 'touch' local file to disable warn for specific file."
     end
 
@@ -122,12 +123,15 @@ module AppStack
 
     def copy_file!(fr, to)
       target_dir = File.dirname(to)
+      puts "copy #{fr.blue} \n   to: " + to.green.bold
+      return if @options.simulate
       FileUtils.mkdir_p target_dir unless File.directory?(target_dir)
-      puts "copied #{fr.blue} \n   to: " + to.green.bold
       FileUtils.cp_r fr, to
     end
 
     def render_file!(fr, to)
+      puts "reader #{fr.blue}\n     to: " + to.green.bold
+      return if @options.simulate
       oh = File.open(to, 'wb')
       if fr.match(/\.liquid$/)
         require 'liquid'
@@ -138,7 +142,6 @@ module AppStack
         oh.write tilt.render(OpenStruct.new(attrs))
       end
       oh.close
-      puts "readered #{fr.blue}\n     to: " + to.green.bold
     end
   end
 end

data/lib/app_stack/version.rb

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

data/tags

@@ -7,39 +7,38 @@
 AppStack	lib/app_stack.rb	/^module AppStack$/;"	m
 AppStack	lib/app_stack/copy_list_builder.rb	/^module AppStack$/;"	m
 AppStack	lib/app_stack/local_files_parser.rb	/^module AppStack$/;"	m
-AppStack	lib/app_stack/merger.rb	/^module AppStack$/;"	m
 AppStack	lib/app_stack/stack_app.rb	/^module AppStack$/;"	m
 AppStack	lib/app_stack/version.rb	/^module AppStack$/;"	m
 CliOptions	lib/app_stack/cli_options.rb	/^class CliOptions$/;"	c
 CopyListBuilder	lib/app_stack/copy_list_builder.rb	/^  module CopyListBuilder$/;"	m	class:AppStack
-CopyListItem	lib/app_stack/stack_app.rb	/^  class CopyListItem$/;"	c	class:AppStack
 LocalFilesParser	lib/app_stack/local_files_parser.rb	/^  module LocalFilesParser$/;"	m	class:AppStack
-Merger	lib/app_stack/merger.rb	/^  class Merger$/;"	c	class:AppStack
 ParseError	lib/app_stack/stack_app.rb	/^  class ParseError < RuntimeError; end$/;"	c	class:AppStack
 StackApp	lib/app_stack/stack_app.rb	/^  class StackApp$/;"	c	class:AppStack
 String	lib/app_stack.rb	/^class String; include Term::ANSIColor end$/;"	c
 app_name	lib/app_stack/local_files_parser.rb	/^    def app_name$/;"	f	class:AppStack.LocalFilesParser
-attr_mod?	lib/app_stack/merger.rb	/^    def attr_mod?(to)$/;"	f	class:AppStack.Merger
-copy_file!	lib/app_stack/merger.rb	/^    def copy_file!(fr, to)$/;"	f	class:AppStack.Merger
+ask_diffs	lib/app_stack/copy_list_builder.rb	/^    def ask_diffs$/;"	f	class:AppStack.CopyListBuilder
+attrs	lib/app_stack/local_files_parser.rb	/^    def attrs$/;"	f	class:AppStack.LocalFilesParser
+check_diff	lib/app_stack/copy_list_builder.rb	/^    def check_diff$/;"	f	class:AppStack.CopyListBuilder
+check_mtime	lib/app_stack/copy_list_builder.rb	/^    def check_mtime$/;"	f	class:AppStack.CopyListBuilder
+copy_file!	lib/app_stack/copy_list_builder.rb	/^    def copy_file!(fr, to)$/;"	f	class:AppStack.CopyListBuilder
 directory	lib/app_stack/local_files_parser.rb	/^    def directory$/;"	f	class:AppStack.LocalFilesParser
-echo	lib/app_stack/stack_app.rb	/^    def echo(msg, var = nil)$/;"	f	class:AppStack.StackApp
+do_copy!	lib/app_stack/copy_list_builder.rb	/^    def do_copy!$/;"	f	class:AppStack.CopyListBuilder
+do_render!	lib/app_stack/copy_list_builder.rb	/^    def do_render!$/;"	f	class:AppStack.CopyListBuilder
+echo	lib/app_stack/stack_app.rb	/^    def echo(msg, var = nil)$/;"	f	class:AppStack
 export_files	lib/app_stack/local_files_parser.rb	/^    def export_files(group = 'default')$/;"	f	class:AppStack.LocalFilesParser
 find_files	lib/app_stack/local_files_parser.rb	/^    def find_files(plist)$/;"	f	class:AppStack.LocalFilesParser
 full_path	lib/app_stack/local_files_parser.rb	/^    def full_path(file)$/;"	f	class:AppStack.LocalFilesParser
 glob_files	lib/app_stack/local_files_parser.rb	/^    def glob_files(dir, allow_hash = false)$/;"	f	class:AppStack.LocalFilesParser
 import_files	lib/app_stack/copy_list_builder.rb	/^    def import_files(import_conf)$/;"	f	class:AppStack.CopyListBuilder
 initialize	lib/app_stack/cli_options.rb	/^  def initialize(argv = ARGV)$/;"	f	class:CliOptions
-initialize	lib/app_stack/merger.rb	/^    def initialize(conf_file, verbose = false)$/;"	f	class:AppStack.Merger
 initialize	lib/app_stack/stack_app.rb	/^    def initialize(filename, options)$/;"	f	class:AppStack.StackApp
-load_stack	lib/app_stack/merger.rb	/^    def load_stack(stack_name, groups)$/;"	f	class:AppStack.Merger
 load_stack	lib/app_stack/stack_app.rb	/^    def load_stack$/;"	f	class:AppStack.StackApp
-merge!	lib/app_stack/merger.rb	/^    def merge!$/;"	f	class:AppStack.Merger
-newer?	lib/app_stack/merger.rb	/^    def newer?(f1, f2)$/;"	f	class:AppStack.Merger
+merge!	lib/app_stack/copy_list_builder.rb	/^    def merge!$/;"	f	class:AppStack.CopyListBuilder
+newer?	lib/app_stack/copy_list_builder.rb	/^    def newer?(f1, f2)$/;"	f	class:AppStack.CopyListBuilder
 parse_export_files	lib/app_stack/local_files_parser.rb	/^    def parse_export_files$/;"	f	class:AppStack.LocalFilesParser
 parse_opt!	lib/app_stack/cli_options.rb	/^  def parse_opt!(argv)$/;"	f	class:CliOptions
-parse_stacks	lib/app_stack/merger.rb	/^    def parse_stacks$/;"	f	class:AppStack.Merger
-prepare	lib/app_stack/merger.rb	/^    def prepare(verbose = false)$/;"	f	class:AppStack.Merger
-render_file!	lib/app_stack/merger.rb	/^    def render_file!(fr, to)$/;"	f	class:AppStack.Merger
+render_file!	lib/app_stack/copy_list_builder.rb	/^    def render_file!(fr, to)$/;"	f	class:AppStack.CopyListBuilder
 short_path	lib/app_stack/local_files_parser.rb	/^    def short_path(path)$/;"	f	class:AppStack.LocalFilesParser
 stackup!	lib/app_stack.rb	/^  def stackup!(argv = ARGV)$/;"	f	class:AppStack
 stackup!	lib/app_stack/stack_app.rb	/^    def stackup!$/;"	f	class:AppStack.StackApp
+switch_to_tpl	lib/app_stack/local_files_parser.rb	/^    def switch_to_tpl(file)$/;"	f	class:AppStack.LocalFilesParser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors: