ditto_code 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c92b4e27799c8657dbe623ef4afc2d94e3a3be
-  data.tar.gz: 92d3a129c6145f515241a9fdea839df3a00d8b46
+  metadata.gz: 503c17acc1713d8a18bc7743cab5cba0a35ec507
+  data.tar.gz: 0fcbdb3bca3cad8b1a60996b5cac220d894ab780
 SHA512:
-  metadata.gz: 19dfffbea20e4cd363397c62fde80c64e9b9eb03518578161df35994a47ad7dac169d817045bfb535ef92b633dd7be9e18d290ceb5af7996b13512799c5c631d
-  data.tar.gz: ef1d1716df484c4ceaa53fb9f8e3d4027baa6203d1f8b6d71e8ce0b5319f997f132a40a61d8a514cd58764b1203f77346610e1c9cf11976f9b6fadfd85388664
+  metadata.gz: 3611652d8c7af10f15d5bb44031c28332954e279ece9469a8564c67d874afe008e8ea33163a57e0fabf77b4f7c6d6ef518f768a07577d8788e1fb1ac5dc2c529
+  data.tar.gz: 16890f66f6024e7afa4e1a5355ee260bc4cfbfcf4a702524484017ee4129bee9f38f0ca5e94e69bf3e06bbe3fc54d9c552683a2ecfd5cdfa1921de9689dc076a

data/lib/dittocode/environments.rb

@@ -13,10 +13,12 @@ module DittoCode
 		# True if the environment is included
 		def isIncluded? (environment)
 
-			if environment.split(",").include? ENV["DITTOCODE_ENV"]
-				true
-			else
-				false
+			ENV["DITTOCODE_ENV"].split(',').each do |env|
+				if environment.split(",").include? env
+					return true
+				else
+					return false
+				end
 			end
 		end
 	end

data/lib/dittocode/parse.rb

@@ -21,7 +21,7 @@ module DittoCode
       @removed = false
 
       # Start to read the file
-      file = File.open(file_path)
+      file = File.open(file_path, "r")
       if isView 
         @file_name = File.basename(file_path, ".erb") 
       else
@@ -29,6 +29,7 @@ module DittoCode
       end
       @dir_name = File.dirname(file_path) + "/"
       @isView = isView
+      @first_line = true
 
       # Generate the new archive
       out_file = initiateFile(file_path)
@@ -48,13 +49,17 @@ module DittoCode
             if @isView
               # rem can stop the execution of this file
               rem = /[\s]*<%[\s]*DittoCode::(?<action>Remove|Hold)File.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"][\s]*%>/.match(line)
-              # m catch a block of dittoCode::Exec
-              m = /[\s]*<%[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"][\s]+do[\s]*%>/.match(line)
+              # is catch a block of DittoCode::Exec.is (Inline conditionals)
+              is =  /[\s]*(?<action>if|unless)[\s]+DittoCode::Exec.is[\s]+['|"](?<environment>[a-zA-Z,]+)['|"][\s]*/.match(line)
+              # m catch a block of dittoCode::Exec.if (Block conditionals)
+              m =   /[\s]*<%[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"][\s]+do[\s]*%>/.match(line)
             else
               rem = /[\s]*DittoCode::(?<action>Remove|Hold)File.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"][\s]*/.match(line)
-              m = /[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"] do/.match(line)
+              is =  /[\s]*(?<action>if|unless)[\s]+DittoCode::Exec.is[\s]+['|"](?<environment>[a-zA-Z,]+)['|"]/.match(line)
+              m =   /[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"] do/.match(line)
             end
 
+            # Remove files
             if rem
 
               # Remove the files and stop the execution of this script
@@ -77,6 +82,22 @@ module DittoCode
 
               dittos += 1
 
+            # Inline conditionals
+            elsif is 
+
+              # Check the action (unless or if)
+              if (is[:action] == 'unless' && !DittoCode::Environments.isIncluded?(is[:environment])) || (is[:action] == 'if' && DittoCode::Environments.isIncluded?(is[:environment]))
+                # We must hold the line
+
+                # Delete the inline conditional from the line
+                line.slice! is[0]
+
+                # Write on the file
+                check_with_indent(out_file, line)
+
+              end
+
+            # Block conditionals
             elsif m 
               # A block as been detected
               actions[:env] = m[:environment]
@@ -86,13 +107,7 @@ module DittoCode
 
               # Ditto is atacking?
               if !actions[:atack] 
-                if file.eof?
-                  # Don't print a \n in the last line
-                  out_file.print(line)
-                else  
-                  out_file.puts(line)
-                end
-
+                check_with_indent(out_file, line)
               else 
                 # He is transforming
                 dittos += 1
@@ -136,7 +151,7 @@ module DittoCode
 
         # Check if the file is removed
         if @removed
-          say "[ "+"OK".color("64d67f")+" ] file #{@dir_name}#{@file_name} as been removed"
+          say "[ "+"OK".color("64d67f")+" ] file #{@dir_name}#{@file_name} has been removed"
         elsif @verbose || dittos != 0
           printf("Ditto say -> [ "+"OK".color("64d67f")+" ] %5s lines ditted on #{@dir_name}#{@file_name}\n", dittos)
         end
@@ -164,10 +179,27 @@ module DittoCode
       # 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))
+
+        line.chomp!
+
+        if @first_line
+
+          if @indent
+            out_file.print("#{line.indent(-1)}")
+          else
+            out_file.print("#{line}")
+          end
+
+          @first_line = false
+
         else
-          out_file.puts(line)
+
+          if @indent
+            out_file.print("\n#{line.indent(-1)}")
+          else
+            out_file.print("\n#{line}")
+          end
+
         end
       end 
 
@@ -234,7 +266,7 @@ module DittoCode
       def closeAndSaveFile(file)
 
         # Close the file
-        file.close;
+        file.close
 
         # Check if we must to remove the file
         if @removed 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditto_code
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Angel M Miguel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indentation