architecture 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1da7f5baa4dcee4b0b3f9e1f62c6c0635ca04ca5
-  data.tar.gz: 539ecd342ed8fb7ba64ccfae94c7b3e2fd80ad39
+  metadata.gz: 0fcb24b8a2873feea219aed7e257aefe340347e4
+  data.tar.gz: 6140c44f1e88760004c0ed1f35e702c83398a557
 SHA512:
-  metadata.gz: a60e864cf2ebfc7c57c830401fba63bc899b74ef566e6ec9617b9278295be82674ee77d325f147b2061df22d1502ad54d3f01dab6b058578d8ac3272179b50a7
-  data.tar.gz: c4f1396ec177b6bfa127e4be28249c73f7946e602438d1c818a91ebeb4b8b0e74594d179680e7bae488e34e0647aa9ebcb7d48b981b7d83c99b46a80405ab47b
+  metadata.gz: 63edd09d277f8624f1ad97fc9f6c7df267e44d30ef4406e348413592281b1732660e23af38c73672936edccac23a8fff6779d6175c3ef2945007a07989b4f5d1
+  data.tar.gz: 9b74e7c0a66a9d2ab110df3116be57aff3a764f42838b042168c20600571593bbf62205670d4c9f5a2e77bbb35e0fd8d34b691b73864573c819c8f74292aa006

data/lib/architecture/dsl.rb

@@ -66,7 +66,7 @@ module Architecture
     end
 
     def replace(file:, search:, content:, location: nil)
-      a = Entity.new(id: directory || file, prefix: location || @destination)
+      a = Entity.new(id: file, prefix: location || @destination)
 
       @output.print("#{indentention}Replacing content in #{a}")
 
@@ -76,7 +76,7 @@ module Architecture
     end
 
     def prepend(file:, content:, context: Architecture::EMPTY_CONTEXT, location: nil)
-      a = Entity.new(id: directory || file, prefix: location || @destination)
+      a = Entity.new(id: file, prefix: location || @destination)
 
       @output.print("#{indentention}Prepending #{a} with content")
 
@@ -106,22 +106,14 @@ module Architecture
       @output.puts(" succeeded.")
     end
 
-    def within(directory: nil, source: join(@source, directory), destination: join(@destination, directory), &block)
+    def within(directory: nil, source: @source, destination: @destination, &block)
       @output.puts "#{indentention}Within #{destination}"
 
-      self.class.new(source: source, destination: destination, output: @output, level: @level + 1, &block)
-    end
-
-    private def source
-      @source
-    end
-
-    private def destination
-      @destination
+      self.class.new(source: join(@source, source, directory), destination:  join(@destination, destination, directory), output: @output, level: @level + 1, &block)
     end
 
     private def join(*ids)
-      File.join(*ids)
+      File.join(*ids.compact)
     end
 
     private def indentention

data/lib/architecture/entity.rb

@@ -66,7 +66,9 @@ module Architecture
     end
 
     private def system(command)
-      `#{command}`
+      Kernel.system("#{command}", :out => "/dev/null").tap do |succeeded|
+        raise "\n`#{command}` failed to work." unless succeeded
+      end
     end
   end
 end

data/lib/architecture/version.rb

@@ -1,3 +1,3 @@
 module Architecture
-  VERSION = "6.0.3"
+  VERSION = "6.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene