mygen 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c78bcafb1f9211495701f07c571eaa276e708da
-  data.tar.gz: e4dbc04ab967348f5aa6bf7500481099729131dc
+  metadata.gz: 1b5980b176d3f346102362eaf5021b4cb57d7171
+  data.tar.gz: b8e933c6197a10989ded6d8693aeb03303a95311
 SHA512:
-  metadata.gz: baf1b50c0d389f2e8ce4908a7a83518966a85c3a2a28b633f76dce5fd3698b027cda85b21e623b6883b1afd44c81c7e768a1f290cf49de22f7de814644b15d19
-  data.tar.gz: dc822ef8141a4b8cd6c4295c950112a09c5f42b037e3968c128f093b241796845c1888722b9adc7b36b317a0a1dc041f13ebdd656def91a5db90f9fb6e0d6492
+  metadata.gz: 5135802771680e2b4ca7412997e521555e54922911baebf788328b59de8ba5124f19408290537330cf94c7181588652305fe2f3b4135a0612004a176796b7859
+  data.tar.gz: 7cc686a2c1d1b275fc7f6bbf82f42914a9cf7975299d06670097e632e1fe20e4a636c78e013574dae8af4c9b78238470ed408b87c0962d2e0c034d79d7cd0d47

data/lib/mygen/generator.rb

@@ -1,4 +1,5 @@
 require 'mygen/naming'
+# require 'byebug'
 
 module Mygen
   class Generator
@@ -89,7 +90,17 @@ module Mygen
     def move_file_in_place(src, dest)
       sf = File.absolute_path(src)
       df = File.absolute_path(dest)
-      fileutils.mv(sf, df) unless sf == df
+      file_exist = File.exist?(df)
+      fileutils.mv(sf, df) if sf != df && !file_exist
+
+      if file_exist && sf != df
+        Dir.glob(File.join(sf, "/*")).each do |f|
+          next if f == sf
+          file = f.sub(sf, '')
+          fileutils.mv(f, File.join(df, file))
+        end
+        fileutils.rm_rf(sf)
+      end
     end
 
     def parse_and_place_file(file, dest, bindings)

data/lib/mygen/version.rb

@@ -1,3 +1,3 @@
 module Mygen
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mygen
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Kristian Rasmussen