ditto_code 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503c17acc1713d8a18bc7743cab5cba0a35ec507
-  data.tar.gz: 0fcbdb3bca3cad8b1a60996b5cac220d894ab780
+  metadata.gz: ad4ecfcfac429c037a6d0c9bb543e2ade3594fea
+  data.tar.gz: 3de061072bc52d8052dfe5f55c9cfcff09671b6d
 SHA512:
-  metadata.gz: 3611652d8c7af10f15d5bb44031c28332954e279ece9469a8564c67d874afe008e8ea33163a57e0fabf77b4f7c6d6ef518f768a07577d8788e1fb1ac5dc2c529
-  data.tar.gz: 16890f66f6024e7afa4e1a5355ee260bc4cfbfcf4a702524484017ee4129bee9f38f0ca5e94e69bf3e06bbe3fc54d9c552683a2ecfd5cdfa1921de9689dc076a
+  metadata.gz: 44ab1072370ac9e39ffcb1950b529d1ee06dba58823454701523d5b0e03334ab02fd7667d71aa9c73abc2e827133ebf4fb867a29d9fd10dfb87a7569f3dda3e1
+  data.tar.gz: 02f84b8d808f653b83667f189c6766f22a1a4801e0ee78eaf779c3358dc7c058aab794fac51e3c9b73303d2def68a03b2858807e52105e2cb7b9ba974f278fc8

data/lib/dittocode/environments.rb

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

data/lib/dittocode/parse.rb

@@ -57,6 +57,7 @@ module DittoCode
               rem = /[\s]*DittoCode::(?<action>Remove|Hold)File.if[\s]+['|"](?<environment>[a-zA-Z,]+)['|"][\s]*/.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)
+              commented = /^[\s]*#/.match(line)
             end
 
             # Remove files
@@ -97,6 +98,14 @@ module DittoCode
 
               end
 
+            # Commented  
+            elsif !@isView && commented
+
+              if !actions[:atack] || DittoCode::Environments.isIncluded?(actions[:env])
+                # Write on the file
+                check_with_indent(out_file, line)
+              end
+
             # Block conditionals
             elsif m 
               # A block as been detected
@@ -118,7 +127,7 @@ module DittoCode
                   # If is the last end, it's coincide with the end of the block
                   if actions[:ends] == 1
                     actions[:atack] = false
-                  elsif actions[:env] == @env
+                  elsif DittoCode::Environments.isIncluded?(actions[:env])
                     # Only how if we must mantain it
                     check_with_indent(out_file, line)
                   end
@@ -129,7 +138,7 @@ module DittoCode
                 else
 
                   # prints of coincide with the environment
-                  if actions[:env] == @env
+                  if DittoCode::Environments.isIncluded?(actions[:env])
                     check_with_indent(out_file, line)
                   end
 

metadata

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