terrascript 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c40419f50c827ccfc419581cbe5980e3e07579b
-  data.tar.gz: a9bfa1e0dd746f5532884dbbdc4920f2beb493db
+SHA256:
+  metadata.gz: a82a83d476331a0d279f31854598ae9ca3f18df09a610973798221564e40c08e
+  data.tar.gz: a0ca074f292a87f79c8a8fb3bea2b0631dfcc1e482934eb82402ed06c1e147d4
 SHA512:
-  metadata.gz: '0528ceb6ec770de3a8678be730a480b98eebdeb97de4264b4f093b0df9aa448d5f54287de7ade8d927d205dfe28da1a76bceee2674033190d2d92a4ac0c0790e'
-  data.tar.gz: d40bb8eb2eadac06cef9d7c6332d6ca8bab2686e26f085f177998ca77602bc7e5548a8c71a6cb248912a65a262ee0190ab702e693c755d4b0eb61ee7b95f5cbf
+  metadata.gz: bfff4a2a1b061fb57fe1b33ca14c87c0eb41e148916d728fa959af2a9e51ef62eb583b942b0573c0a542bfcc9de9ebc276af8ecf4f434d541b6dedd987a2e4fa
+  data.tar.gz: 9f4a3cf889816a7ebc08ba45492ad903e4c975237eef44ac8adfedc194839487eb710b3134ddaabe44df54de5656b8e4a4a22430b0cb4629e2cfa9d25d75296f

data/bin/terrascript

@@ -1,71 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'digest'
 require 'fileutils'
+require 'digest'
+require 'terrascript'
 
-class Transform
-  def transform
-    eval("lambda { |#{@argName}|\n#{@body}\n}").call(@arg)
-  end
-
-  def initialize(fname)
-    @fname = fname
-    @mode = :read
-    @argName = "block"
-    @arg = ""
-    @body = ""
-  end
-
-  def process
-    $stdout = File.new(@fname.gsub(".tfrb", ".tf"), "w")
-    File.open(@fname).each do |line|
-      processLine line
-    end
-    $stdout.close
-    $stdout = STDOUT
-  end
-
-  def processLine(line)
-    case @mode
-
-    when :read
-      if line.lstrip.start_with?("@inline")
-        args = line.split(' ')
-        if !args[1].nil?
-          @argName = args[1]
-        end
-        @mode = :body
-      else
-        puts line
-      end
-
-    when :arg
-      if line.lstrip.start_with?("@end")
-        @arg << "\n"
-        transform
-        @arg = ""
-        @body = ""
-        @mode = :read
-      else
-        @arg << line
-      end
-
-    when :body
-      @body << line
-      if line.lstrip.start_with?("return")
-        @mode = :arg
-      end
-
-    end
-  end
-
-end
-
-def processFile f
+def processFile fname
   hash_dir = ".terraform/.tfrb"
   FileUtils.mkdir_p(hash_dir)
 
-  fname_hash = Digest::SHA256.hexdigest f
+  fname_hash = Digest::SHA256.hexdigest fname
 
   hash_file = "#{hash_dir}/#{fname_hash}"
 
@@ -74,14 +17,17 @@ def processFile f
     old_sha = File.read hash_file
   end
 
-  sha = Digest::SHA256.hexdigest File.read f
+  versionContents = Gem.loaded_specs['terrascript'].version.version << (File.read fname)
+  sha = Digest::SHA256.hexdigest versionContents
 
   if old_sha != sha
-    File.open(hash_file, "w") { |hash_fd| hash_fd.write sha}
-
-    File.open(f).each do |l|
-      Transform.new(f).process
+    File.open(fname) do |f|
+      File.open(fname.gsub(".tfrb", ".tf"), "w") do |out|
+        Transform.new(f, out).process
+      end
     end
+
+    File.open(hash_file, "w") { |hash_fd| hash_fd.write sha}
     puts "=> Done"
   else
     puts "=> Unchanged"
@@ -93,4 +39,6 @@ Dir.glob("**/*.tfrb").each do |f|
   processFile(f)
 end
 
-exec("terraform", *ARGV)
+if !ENV.has_key? "TFSC_NOEXEC"
+  exec("terraform", *ARGV)
+end

data/lib/terrascript.rb

@@ -0,0 +1,59 @@
+
+
+class Transform
+  def transform
+    s = $stdout
+    $stdout = @out
+    eval("lambda { |#{@argName}|\n#{@body}\n}").call(@arg)
+    $stdout = s
+  end
+
+  def initialize(inFd, outFd = $stdout)
+    @in = inFd
+    @out = outFd
+    @mode = :read
+    @argName = "block"
+    @arg = ""
+    @body = ""
+  end
+
+  def process
+    @in.each do |line|
+      processLine line
+    end
+  end
+
+  def processLine(line)
+    case @mode
+
+    when :read
+      if line.lstrip.start_with?("@inline")
+        args = line.split(' ')
+        if !args[1].nil?
+          @argName = args[1]
+        end
+        @mode = :body
+      else
+        @out.puts line
+      end
+
+    when :arg
+      if line.lstrip.start_with?("@end")
+        transform
+        @arg = ""
+        @body = ""
+        @mode = :read
+      else
+        @arg << line
+      end
+
+    when :body
+      @body << line
+      if line.lstrip.start_with?("return")
+        @mode = :arg
+      end
+
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrascript
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marcin Chmiel
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-04-10 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: marcin.k.chmiel@gmail.com
 executables:
@@ -19,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - bin/terrascript
+- lib/terrascript.rb
 homepage: https://github.com/mewa/terrascript
 licenses:
 - MIT
@@ -39,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Terraform wrapper which adds Ruby scripting capabilities to your infrastructure