ditto_code 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45d548498e69ecad8d759e8aed1e3c17df6765e
-  data.tar.gz: 18c3ea1ca196d56fe0ccb2ad177cb0fac9bdedb3
+  metadata.gz: 89878b0fa06bbd81f76c75ccd999d978cd61a25b
+  data.tar.gz: 4e890cabd15a0063b01cc9306759707a361e7b2a
 SHA512:
-  metadata.gz: 065e4d4bb009ff1e516dbdd193334edbd303e411501d93a7675d79e9d0ca0949cb64d9a4273e79e118c20d2a802d9c3814864920f267c082f7fb1c877658034d
-  data.tar.gz: 35e6fc6473fee37d2bd84a0e9e34a39233bba9535bd57b8f9e6e70920244d2cccd4f84294924f9aa20d61e20c49b22d1cfeba974652fa8ca81d184e3b736b143
+  metadata.gz: ce6fefc7f72c9584ebce1a52208146b62ceb97f4783723dd044cadd3363768d3e0811922568aba528ba28f9a57412c2db4cddb390ddd5a566be89fb53b81e743
+  data.tar.gz: 54907456795f48ee4e6d523324fe9aaccb6fcc51e1a888f2284fabd5d6883365d833d30b18a471b50fc57a65299684ec5c72d85a6bb74f7b0d1623336d0c885e

data/bin/dittoc

@@ -81,7 +81,7 @@ def iterateFolder(folder)
 end
 
 # ===============================================================
-# VARIAVLEs
+# VARIABLES
 # ===============================================================
 
 $isFolder = false;
@@ -147,8 +147,11 @@ end
 
 unless @stop
 
+	# Initiate the global var for the parser
+	ENV["DITTOCODE_ENV"] = $environment
+
 	# Initiate ditto
-	@ditto = DittoCode::Parse.new($environment, $override, $verbose, $indent)
+	@ditto = DittoCode::Parse.new($override, $verbose, $indent)
 
 	# Check if the user has introduce a folder/file
 	if $folder.empty?

data/lib/ditto_code.rb

@@ -1,11 +1,19 @@
 require 'dittocode/parse'
 require 'dittocode/exec'
 require 'dittocode/talk'
+require 'dittocode/remove_file'
+require 'dittocode/hold_file'
+require 'dittocode/environments'
+include DittoCode::Environments
 include DittoCode::Exec
 include DittoCode::Talk
+include DittoCode::RemoveFile
+include DittoCode::HoldFile
 
 module DittoCode
-  def self.symbolize_keys h
-    h.inject({}) { |opts,(k,v)| opts[(k.to_sym rescue k) || k] = v; opts }
-  end
+
+  #def self.symbolize_keys h
+  #  h.inject({}) { |opts,(k,v)| opts[(k.to_sym rescue k) || k] = v; opts }
+  #end
+
 end

data/lib/dittocode/environments.rb

@@ -0,0 +1,23 @@
+module DittoCode
+
+	module Environments
+
+		# Check the presence of the environment constant
+		def check_env
+			if ENV["DITTOCODE_ENV"].nil? || ENV["DITTOCODE_ENV"].empty?
+				puts 'Ditto say -> Environment isn\'t declared'
+			end
+			@initialize = true
+		end
+
+		# True if the environment is included
+		def isIncluded? (environment)
+
+			if environment.split(",").include? ENV["DITTOCODE_ENV"]
+				true
+			else
+				false
+			end
+		end
+	end
+end

data/lib/dittocode/exec.rb

@@ -7,23 +7,13 @@ module DittoCode
 
 			# check the env code
 			unless @initialize
-				check_env
+				DittoCode::Environments.check_env
 			end
 
-			if ENV["DITTOCODE_ENV"] == environment
+			if DittoCode::Environments.isIncluded? environment
 				yield
 			end 
 		end
 
-		private
-
-		# Check the presence of the environment constant
-		def check_env
-			if ENV["DITTOCODE_ENV"].nil? || ENV["DITTOCODE_ENV"].empty?
-				puts 'Ditto say -> Environment isn\'t declared'
-			end
-			@initialize = true
-		end
 	end
-
 end

data/lib/dittocode/hold_file.rb

@@ -0,0 +1,19 @@
+module DittoCode
+
+	@initialize = false
+
+	module HoldFile
+		def self.if (environment)
+
+			# check the env code
+			unless @initialize
+				DittoCode::Environments.check_env
+			end
+
+			unless DittoCode::Environments.isIncluded? environment
+				exit
+			end 
+		end
+		
+	end
+end

data/lib/dittocode/parse.rb

@@ -7,11 +7,12 @@ module DittoCode
     require 'rainbow/ext/string'
 
     # Initialize the environment
-    def initialize(environment, override, verbose, indent)
-      @env = environment
+    def initialize(override, verbose, indent)
+      @env = ENV["DITTOCODE_ENV"]
       @override = override
       @verbose = verbose
       @indent = indent
+      @remove = false
     end
 
     # Transform the file based in the environment
@@ -43,17 +44,45 @@ module DittoCode
           if /[\s]*require[\s]*['|"](ditto_code)['|"]/.match(line).nil?
 
             if @isView
-              m = /[\s]*<%[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"][\s]+do[\s]*%>/.match(line)
+              # 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)
             else
-              m = /[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"] do/.match(line)
+              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)
             end
 
-            if m 
+            if rem
+
+              # Remove the files and stop the execution of this script
+              if rem[:action] == 'Remove'
+                # Remove action
+                if DittoCode::Environments.isIncluded? rem[:environment]
+                  @removed = true
+                  break
+                end
+
+              else
+
+                # Hold action
+                unless DittoCode::Environments.isIncluded? rem[:environment]
+                  @removed = true
+                  break
+                end
+                
+              end
+
+              dittos += 1
+
+            elsif m 
+              # A block as been detected
               actions[:env] = m[:environment]
               actions[:atack] = true;
               actions[:ends] = 1;
             else
 
+              # Ditto is atacking?
               if !actions[:atack] 
                 if file.eof?
                   # Don't print a \n in the last line
@@ -77,6 +106,7 @@ module DittoCode
                     check_with_indent(out_file, line)
                   end
 
+                  # -1 end
                   actions[:ends] -= 1
 
                 else
@@ -96,15 +126,22 @@ module DittoCode
 
             end
 
+          else
+            # We delete the line require 'ditto_code'
+            dittos += 1
           end
 
         end
 
-        if @verbose || dittos != 0
-          say "[ "+"OK".color("64d67f")+" ] #{dittos} lines ditted on #{@dir_name}#{@file_name}!"
+        # Check if the file is removed
+        if @removed
+          say "[ "+"OK".color("64d67f")+" ] file #{@dir_name}#{@file_name} as been removed"
+        elsif @verbose || dittos != 0
+          say "[ "+"OK".color("64d67f")+" ] #{dittos} lines ditted on #{@dir_name}#{@file_name}"
         end
 
-        closeFile(out_file)
+        # Close and save the file
+        closeAndSaveFile(out_file)
       
       rescue => e
 
@@ -193,12 +230,30 @@ module DittoCode
       # file        => file to close
       # file_name   => name of the file
       # file_path   => path of the original file
-      def closeFile(file)
+      def closeAndSaveFile(file)
 
         # Close the file
         file.close;
 
-        if(@override)
+        # Check if we must to remove the file
+        if @removed 
+
+          # We need to remove
+          if @override
+
+            if @isView 
+              File.delete("#{@dir_name}#{@file_name}.erb")
+            else
+              File.delete("#{@dir_name}#{@file_name}.rb")
+            end
+
+            File.delete(file)
+          else
+            File.delete(file)
+          end
+
+        elsif @override
+          # No delete, but override?
           if @isView 
             File.delete("#{@dir_name}#{@file_name}.erb")
             File.rename(file, "#{@dir_name}#{@file_name}.erb")

data/lib/dittocode/remove_file.rb

@@ -0,0 +1,19 @@
+module DittoCode
+
+	@initialize = false
+
+	module RemoveFile
+		def self.if (environment)
+
+			# check the env code
+			unless @initialize
+				DittoCode::Environments.check_env
+			end
+
+			if DittoCode::Environments.isIncluded? environment
+				exit
+			end 
+		end
+
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ditto_code
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Angel M Miguel
@@ -47,8 +47,11 @@ extra_rdoc_files: []
 files:
 - bin/dittoc
 - lib/ditto_code.rb
+- lib/dittocode/environments.rb
 - lib/dittocode/exec.rb
+- lib/dittocode/hold_file.rb
 - lib/dittocode/parse.rb
+- lib/dittocode/remove_file.rb
 - lib/dittocode/talk.rb
 homepage: https://github.com/Angelmmiguel/ditto_code
 licenses: