magma_cli 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0d8d4b3d34fe69982a6090c0a357645fca18c3f15361e0134383cf5125df322
-  data.tar.gz: 5527aa6625286aa29fd707cda710148aa322de595d497c212c7db0c76849afe0
+  metadata.gz: 8d26498b3d1591c2612951f4c8b9726089f1024ed9f1fa7630105a8f14d93d28
+  data.tar.gz: 2777a4ef69415a44dcf8ed8bcac260855c6ab8f00d3c0091ceb59a539d6f3343
 SHA512:
-  metadata.gz: ff9e3ac15490e7e27e4ca59d58787828525e8104ea3126097e4039ad9bfdd89b6ae39fcdd4eda8fc33c284d6ed0330fe3f55f5a3066e2b20b6cd4da0136c7e22
-  data.tar.gz: 24fa8a2f18f1f73a090d39b671de045d139c68edd13a561f959dd47e550d29da0cb6e22c8d42afb81fcd08e1c80d4dddc22156e2012c280725735fb7638dca95
+  metadata.gz: 4bcb2096d539d095c6c853b95a43d77f7dc972d82893b525cf1548c95d5a60be7069fb80fe1b8317ef3358861bd7955b86b897f58dc16817a4c2dec5ce3cc1ba
+  data.tar.gz: 2366dd4b7c986f072a8898d03455e1a2614629fa946b96d5527684647c5ebf9395b85511d446527ded1de46df58d3af070c3c7f6aedc0ec59fc1183d924e7a88

data/lib/magma/preparer.rb

@@ -14,7 +14,7 @@ module Magma
     end
 
     def call
-      stabilize_producers!
+      expand_resource_paths!
       handle_output! xml, options.merge(infile: infile)
       xml
     end
@@ -37,11 +37,10 @@ module Magma
       File.dirname File.expand_path(infile)
     end
 
-    def stabilize_producers! # rubocop:disable Metrics/AbcSize
+    def expand_resource_paths!
       map = Hash[doc.xpath('//producer').map do |producer|
         id = producer.get_attribute 'id'
-        next nil if uuid? id
-        [producer.get_attribute('id'), uuid]
+        [id, producer]
       end.compact]
       return if map.empty?
 
@@ -50,9 +49,6 @@ module Magma
         case node.name
         when 'producer'
           if map[id]
-            log "Re-mapping producer##{id} id to #{map[id]}"
-            node.set_attribute('id', map[id])
-
             node.search('property[name="resource"]').each do |property|
               if File.file?(File.join(resource_path, property.content))
                 log "Expanding resource '#{resource_path}/#{property.content}'"
@@ -60,22 +56,12 @@ module Magma
               end
             end
           end
-        else
-          producer = node.get_attribute 'producer'
-          if map[producer]
-            node.set_attribute('producer', map[producer])
-            log "Re-mapping #{node.name}#{id ? '#' + id : ''} producer to #{map[producer]}"
-          end
         end
       end
     end
 
     def source
-      @source ||= read_file_or_stdin(infile) || raise('Need a template')
-    end
-
-    def uuid
-      SecureRandom.uuid
+      @source ||= read_file_or_stdin(infile) || options[:source] || raise('Need a template')
     end
 
     def xml

data/lib/magma/templater.rb

@@ -40,7 +40,7 @@ module Magma
     end
 
     def source
-      @source ||= read_file_or_stdin(infile) || raise('Need a template')
+      @source ||= read_file_or_stdin(infile) || options[:source] || raise('Need a template')
     end
 
     ### Pipeline

data/lib/magma/version.rb

@@ -1,3 +1,3 @@
 module Magma
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magma_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Allan Reyes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
 description: Command-line interface for MLT templating and rendering
 email:
 - allanbreyes@users.noreply.github.com