gitcopier 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbcb2f87394cf7cc79d461bc6b676f116ae68d9
-  data.tar.gz: e1151f86602623493d31335579f901b6f3703d2e
+  metadata.gz: a92ef8ec9c7b0d07b007b2c07bf8b75a6ea3f682
+  data.tar.gz: 7f4b3e003e6e2f3dd3bb858fe8e23ded95b641e7
 SHA512:
-  metadata.gz: 2b34598a704fd962224dc9e0c70bc4f25761def16da1a2440d59205193269273bc687ae9fed7d79dcf82ada762d946fafdcd2ab877ace99d3c8349d43c5cd7ab
-  data.tar.gz: d8055374880087eb46d633f7f5d335efa30552e5271e3ab7604f14f86ee7988fa13c2e8a20081bc153e8184193291264e993cdb92aa7e43b2530bb3d1254d748
+  metadata.gz: 18deaeed1fc1f830dc5a35a39d21b71645aea2edb22b30ad506c1046734ea4b31a10af27f104b56220da30dfd0a3225a5add642f7b9778715338623e49a6b25b
+  data.tar.gz: ff1f1eb591af611519b516ac44b82f10d68d3c18bb0c238d187970a33247a568cbcd019e87fa3e66f8152b6bdc29c9862364dff6a3eb3df86edab7db7af78fe8

data/README.md

@@ -61,6 +61,7 @@ Usage: gitcopier [options]
 ### Working with git merge
 After you `git pull` in external repository, `Gitcopier` will prompt your decision
 where to copy the changed files.
+![Gitcopier prompt](http://puu.sh/kSEKl/bcdf8898e6.gif)
 
 ## Contributing
 

data/lib/gitcopier.rb

@@ -30,8 +30,10 @@ module Gitcopier
 
     def copy(source, des)
       # source is a directory, copy its content
+      # TODO: create destination if it doesnt exist
       if source.end_with? '/'
         puts "Copy #{(source + '*').colorize(:green)} to #{des.colorize(:green)}."
+        FileUtils.mkdir_p(des)
         FileUtils.cp_r(Dir["#{source}*"], des)
       else # source is a file, copy it to destination
         puts "Copy #{source.colorize(:green)} to #{des.colorize(:green)}."
@@ -54,6 +56,7 @@ module Gitcopier
     end
 
     def integrate_all_changes
+      STDIN.reopen('/dev/tty')
       print_integration_info
       dir_tree = DirTree.new(@root_path, changed_files)
       dir_tree.travel do |changed_file|

data/lib/gitcopier/decisions.rb

@@ -34,6 +34,8 @@ module Gitcopier
     end
 
     def prompt_decision(changed_file)
+      source_file = @source_root + changed_file
+      source_file << "*" if source_file[-1] == "/"
       while true do
         print "Where do you want to copy #{(@source_root + changed_file).colorize(:green)}? (type h for instruction): "
         user_input = Readline.readline("", true).strip

data/lib/gitcopier/version.rb

@@ -1,3 +1,3 @@
 module Gitcopier
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitcopier
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Victor Tran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ files:
 - lib/gitcopier/decisions/decisions.json
 - lib/gitcopier/dir_tree.rb
 - lib/gitcopier/version.rb
-homepage: https://github.com/tranvictor/integrator
+homepage: https://github.com/tranvictor/gitcopier
 licenses:
 - MIT
 metadata: {}