ditto_code 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea196dce723d0ac359698050ce90f82f8f0e881
-  data.tar.gz: 49835ff70f702190110698aec6b36d574194a949
+  metadata.gz: ff2bc71ba0731750d144d1878e573f6bc2b85e98
+  data.tar.gz: b183b41ca6d755444711a1580b253234a08a0bb7
 SHA512:
-  metadata.gz: 7076a4c538c10972d81f43f625d87cfeea2dcc3b97c29ef253f69dc875dd00b6a61d85c3209f2f62365f4780efa9f3368a41e0d4bdb0e389c73c4b0803bff39d
-  data.tar.gz: b137220d26735421ac0a6955e976a982cb2bdd8a6dae9131c5617fc9eed82a1015e176cd2ad30f6eb00322f2d814cf16b43969bd7b1cc0ca5307a81a52d668df
+  metadata.gz: 8c22c60d9860e6367dfc1d4ca1779596520e8951d297c59f09bf4f8fb61c340808603b26b28e1bceddae817b00d2487e3eb276165aedcd16b243b59ff49da534
+  data.tar.gz: 7ae8682cece826d4cb2df8d207eae3aac3a59d4808a55355938bbf28dec941830e5774ac923f7990c63fd12ad9899876336b527c6e31b0ea2fde5858d9b5f937

data/bin/dittoc

@@ -7,7 +7,7 @@ require 'ditto_code'
 
 def usage(s)
     $stderr.puts("Ditto say -> [Err] " + s)
-    $stderr.puts("Ditto say -> [Usage] #{File.basename($0)}: [-v <verbose>] [-f <folder>] [-r <recursive>] [-o <override files>] [--allow-views <search in views>] ENVIRONMENT file|folder")
+    $stderr.puts("Ditto say -> [Usage] #{File.basename($0)}: [-v <verbose>] [-f <folder>] [-r <recursive>] [-o <override files>] [--allow-views <search in views>] [-i <indent>] ENVIRONMENT file|folder")
     exit(1)
 end
 
@@ -64,6 +64,7 @@ $verbose = false;
 $override = false;
 @recursive = false
 @allow_views = false
+$indent = false
 
 # ===============================================================
 # INITIATION
@@ -76,14 +77,17 @@ while ARGV[0]
 	    	$isFolder = true
 	    when '-v' 
 	    	ARGV.shift 
-	    	$verbose = ARGV.shift
+	    	$verbose = true
 	    when '-o' 
 	    	ARGV.shift
 	    	$override = true
 	    when '-r' 
 	    	ARGV.shift
 	    	@recursive = true
-	     when '--allow-views' 
+	    when '-i' 
+	    	ARGV.shift
+	    	$indent = true
+	    when '--allow-views' 
 	    	ARGV.shift
 	    	@allow_views = true	
 	    when /^-/ 
@@ -104,7 +108,7 @@ end
 # ===============================================================
 
 # Initiate ditto
-@ditto = DittoCode::Parse.new($environment, $override)
+@ditto = DittoCode::Parse.new($environment, $override, $verbose, $indent)
 
 # Check if the user has introduce a folder/file
 if $folder.empty?
@@ -121,7 +125,11 @@ else
 		iterateFolder($folder)
 	else
 		# Only a file
-		ditto.transformation($folder)
+		if $folder.end_with?('.rb')
+  			@ditto.transformation($folder, false)
+  		elsif $folder.end_with?('.erb') && @allow_views
+  			@ditto.transformation($folder, true)
+  		end
 	end
 
 end

data/lib/dittocode/parse.rb

@@ -10,18 +10,25 @@ module DittoCode
     end
 
     # Initialize the environment
-    def initialize(environment, override)
-      @env = environment;
-      @override = override;
+    def initialize(environment, override, verbose, indent)
+      @env = environment
+      @override = override
+      @verbose = verbose
+      @indent = indent
     end
 
     # Transform the file based in the environment
-    def transformation(file_path, @isView)
+    def transformation(file_path, isView)
 
       # Start to read the file
       file = File.open(file_path)
-      @file_name = File.basename(file_path, ".rb") 
+      if isView 
+        @file_name = File.basename(file_path, ".erb") 
+      else
+        @file_name = File.basename(file_path, ".rb")
+      end
       @dir_name = File.dirname(file_path) + "/"
+      @isView = isView
 
       # Generate the new archive
       out_file = initiateFile(file_path)
@@ -32,10 +39,8 @@ module DittoCode
       # Get the text
       # Protect against nil or directory when it's a file
       begin
-        text = file.read
-
         # Each line........
-        text.each_line do | line |
+        file.each_line do | line |
 
           if @isView
             m = /[\s]*<%[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"][\s]+do[\s]*%>/.match(line)
@@ -50,7 +55,13 @@ module DittoCode
           else
 
             if !actions[:atack] 
-              out_file.puts(line)
+              if file.eof?
+                # Don't print a \n in the last line
+                out_file.print(line)
+              else  
+                out_file.puts(line)
+              end
+
             else 
               # He is transforming
               dittos += 1
@@ -63,7 +74,7 @@ module DittoCode
                   actions[:atack] = false
                 elsif actions[:env] == @env
                   # Only how if we must mantain it
-                  out_file.puts(line.indent(-1))
+                  check_with_indent(out_file, line)
                 end
 
                 actions[:ends] -= 1
@@ -72,7 +83,7 @@ module DittoCode
 
                 # prints of coincide with the environment
                 if actions[:env] == @env
-                  out_file.puts(line.indent(-1))
+                  check_with_indent(out_file, line)
                 end
 
                 # Check if we need to add a new end
@@ -87,7 +98,10 @@ module DittoCode
 
         end
 
-        say "[Ok] #{dittos} lines ditted on #{@dir_name}#{@file_name}!"
+        if @verbose || dittos != 0
+          say "[Ok] #{dittos} lines ditted on #{@dir_name}#{@file_name}!"
+        end
+
         closeFile(out_file)
       
       rescue => e
@@ -98,20 +112,36 @@ module DittoCode
           say "[Err] Oh no! I have an error :("  
         end
 
+        if @verbose
+          say e
+        end
+
       end 
     end
 
     private
 
+      # Send the line into the file. If indent is true
+      # The line will be indented
+      def check_with_indent(out_file, line)
+        if @indent
+          out_file.puts(line.indent(-1))
+        else
+          out_file.puts(line)
+        end
+      end 
+
       # Detect an end line
       def isEnd?(line)
 
         # Coincide with an end!
-        if /^[\s]*end/.match(line)
-          return true
+        if @isView && /[\s]+(end)[\s]*%>/.match(line)
+          true
+        elsif /^[\s]*end/.match(line)
+          true
+        else
+          false 
         end
-
-        return false
       end
 
       # Detect if we need to add a new end
@@ -120,7 +150,7 @@ module DittoCode
         # Get the initializers and the ends of the blocks
         if @isView
           initializers = line.scan(/<%[\s]*(if|do|def)[\s]+/).size + line.scan(/<%[@=;\s\w\d]*(if|do|def)[\s]+/).size
-          finals = line.scan(/[\s]+(end)[\s]*%>/).size + line.scan(/<%[\s]*(end)[\s]*%>/).size
+          finals = line.scan(/[\s]+(end)[\s]*%>/).size
         else
           initializers = line.scan(/^(if|do|def)[\s]+/).size + line.scan(/[\s]+(if|do|def)[\s]+/).size + line.scan(/[\s]+(if|do|def)$/).size
           finals = line.scan(/[\s]+(end)[\s]+/).size + line.scan(/^(end)[\s]+/).size + line.scan(/[\s]+(end)$/).size
@@ -135,9 +165,17 @@ module DittoCode
       def initiateFile(file_path)
 
         if(@override)
-          File.new("#{@dir_name}#{@file_name}_tmp.rb", "w")
+          if @isView 
+            File.new("#{@dir_name}#{@file_name}_tmp.erb", "w")
+          else
+            File.new("#{@dir_name}#{@file_name}_tmp.rb", "w")
+          end
         else
-          File.new("#{@dir_name}#{@file_name}_#{@env}.rb", "w")
+          if @isView 
+            File.new("#{@dir_name}#{@file_name}_#{@env}.erb", "w")
+          else
+            File.new("#{@dir_name}#{@file_name}_#{@env}.rb", "w")
+          end
         end
 
       end
@@ -153,8 +191,13 @@ module DittoCode
         file.close;
 
         if(@override)
-          File.delete(file)
-          File.rename(file, "#{@dir_name}#{@file_name}.rb")
+          if @isView 
+            File.delete("#{@dir_name}#{@file_name}.erb")
+            File.rename(file, "#{@dir_name}#{@file_name}.erb")
+          else
+            File.delete("#{@dir_name}#{@file_name}.rb")
+            File.rename(file, "#{@dir_name}#{@file_name}.rb")
+          end
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ditto_code
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Angel M Miguel