architecture 5.2.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce3b7713d38479cedf2733145b9cb8b8566ceab
-  data.tar.gz: 30282201b865ca1894be94b9cfc6830c6054edce
+  metadata.gz: d0018a5e560bdab42d3233c1787f1f7d5deedb46
+  data.tar.gz: 110444d0a95fc6474f87213028fa3b1d3756c569
 SHA512:
-  metadata.gz: 3e6a9f662e52e99478fab258d94ad63a7f66b95627926a0adc857dce07b48dd2f0244a0149476872fe38a78d9dbb19ea5dbb6a59c5af8fb5fa0b7f4978ea74f1
-  data.tar.gz: 409299288b04bc99d4d99057aab1f81638f5b2a5af96afc3c7dace0aa4f154e866d6eacc2f9b3a096ce2f38844fac69bdf7c2c8ab9a3e63c46997c838cd6fed2
+  metadata.gz: 85f72b3371d8640b7bb2b864cec8c918ff63351abd309e4952a8cfd771d62dc4d1fe326526234c99ac523fd2e096a1b99a2934d1f426fc61558b632701daab8e
+  data.tar.gz: 1d5fa573a11c11fdf6d0556f2c8ae0e6b3a6ccb43691ebe2a5ba597ddb972d031388241bdabdd619e8e942c06a8911c6d6830523fb43612a9dd1931055165f96

data/lib/architecture.rb

@@ -15,6 +15,10 @@ module Architecture
   require_relative "architecture/replace"
   require_relative "architecture/version"
 
+  EMPTY_CONTEXT = {}
+  EMPTY_PATTERN = ""
+  EMPTY_CONTENT = ""
+
   private def architecture(source:, destination:, &block)
     ::Architecture::DSL.new(source: source, destination: destination, &block)
   end

data/lib/architecture/append.rb

@@ -3,8 +3,8 @@ module Architecture
     include Entityable
     include Contentable
 
-    def initialize(source:, content: "", context: {})
-      @entity = Entity.new(path: source)
+    def initialize(source:, content: Architecture::EMPTY_CONTENT, context: Architecture::EMPTY_CONTEXT)
+      @entity = source
       @content = content
       @context = context
     end
@@ -13,7 +13,7 @@ module Architecture
       if entity.file?
         entity.write(text: data)
       else
-        raise ArgumentError, "Source wasn't a file"
+        raise(ArgumentError, "Source wasn't a file")
       end
     end
 

data/lib/architecture/copy.rb

@@ -3,9 +3,9 @@ module Architecture
     include Replicatable
     include Contentable
 
-    def initialize(source:, destination:, context: {})
-      @origin = Entity.new(path: source)
-      @clone = Entity.new(path: destination)
+    def initialize(source:, destination:, context: Architecture::EMPTY_CONTEXT)
+      @origin = source
+      @clone = destination
       @context = context
     end
 

data/lib/architecture/create.rb

@@ -3,8 +3,8 @@ module Architecture
     include Entityable
     include Contentable
 
-    def initialize(source:, content:, context:)
-      @entity = Entity.new(path: source)
+    def initialize(source:, content: Architecture::EMPTY_CONTENT, context: Architecture::EMPTY_CONTEXT)
+      @entity = source
       @content = content
       @context = context
     end

data/lib/architecture/delete.rb

@@ -3,7 +3,7 @@ module Architecture
     include Entityable
 
     def initialize(source:)
-      @entity = Entity.new(path: source)
+      @entity = source
     end
 
     def call

data/lib/architecture/dsl.rb

@@ -2,59 +2,130 @@ require "architecture"
 
 module Architecture
   class DSL
-    def initialize(source:, destination:)
+    def initialize(source:, destination:, output: STDOUT, level: 0)
       @source = source
       @destination = destination
+      @output = output
+      @level = level
 
       yield(self)
     end
 
-    def copy(file: nil, directory: nil, as: nil, context: {})
-      ::Architecture::Copy.new(source: source(directory || file), destination: destination(as || directory || file), context: context).call
+    def copy(file: nil, directory: nil, as: nil, context: EMPTY_CONTEXT, &block)
+      a = Entity.new(id: directory || file, prefix: @source)
+      b = Entity.new(id: as || directory || file, prefix: @destination)
+
+      @output.print("#{indentention}Copying #{a} to #{b}")
+
+      Copy.new(source: a, destination: b, context: context)
+
+      @output.puts(" succeeded.")
+
+      if block_given? && directory
+        within(directory: directory)
+      end
     end
 
-    def move(file: nil, directory: nil, as:)
-      ::Architecture::Move.new(source: directory || file, destination: as).call
+    def move(file: nil, directory: nil, as:, &block)
+      a = Entity.new(id: directory || file, prefix: @source)
+      b = Entity.new(id: as, prefix: @destination)
+
+      @output.print("#{indentention}Moving #{a} to #{b}")
+
+      Move.new(source: a, destination: b)
+
+      @output.puts(" succeeded.")
+
+      if block_given? && directory
+        within(directory: directory)
+      end
     end
 
-    def create(directory: nil, file: nil, content: nil, context: {})
-      ::Architecture::Create.new(source: directory || file, content: content, context: context).call
+    def create(file: nil, directory: nil, content: nil, context: EMPTY_CONTEXT, location: nil, &block)
+      a = Entity.new(id: directory || file, prefix: location || @destination)
+
+      @output.print("#{indentention}Creating #{a}")
+
+      Create.new(source: a, content: content, context: context)
+
+      @output.puts(" succeeded.")
+
+      if block_given? && directory
+        within(directory: directory)
+      end
     end
 
-    def delete(directory: nil, file: nil)
-      ::Architecture::Delete.new(source: directory || file).call
+    def delete(directory: nil, file: nil, location: nil)
+      a = Entity.new(id: directory || file, prefix: location || @destination)
+
+      @output.print("#{indentention}Deleting #{a}")
+
+      Delete.new(source: a)
+
+      @output.puts(" succeeded.")
     end
 
-    def replace(file: nil, search:, content:)
-      ::Architecture::Replace.new(source: file, search: search, content: content).call
+    def replace(file:, search:, content:, location: nil)
+      a = Entity.new(id: directory || file, prefix: location || @destination)
+
+      @output.print("#{indentention}Replacing content in #{a}")
+
+      Replace.new(source: a, search: search, content: content)
+
+      @output.puts(" succeeded.")
     end
 
-    def prepend(file: nil, content:, context: {})
-      ::Architecture::Prepend.new(source: file, content: content, context: context).call
+    def prepend(file:, content:, context: Architecture::EMPTY_CONTEXT, location: nil)
+      a = Entity.new(id: directory || file, prefix: location || @destination)
+
+      @output.print("#{indentention}Prepending #{a} with content")
+
+
+      Prepend.new(source: a, content: content, context: context)
+
+      @output.puts(" succeeded.")
     end
 
-    def append(file: nil, content:, context: {})
-      ::Architecture::Append.new(source: file, content: content, context: context).call
+    def append(file:, content:, context: Architecture::EMPTY_CONTEXT, location: nil)
+      a = Entity.new(id: directory || file, prefix: location || @destination)
+
+      @output.print("#{indentention}Appending #{a}")
+
+      Append.new(source: a, content: content, context: context)
+
+      @output.puts(" succeeded.")
     end
 
-    def overwrite(file: nil, content:, context: {})
-      ::Architecture::Overwrite.new(source: file, content: content, context: context).call
+    def overwrite(file:, content:, context: Architecture::EMPTY_CONTEXT, location: nil)
+      a = Entity.new(id: directory || file, prefix: location || @destination)
+
+      @output.print("#{indentention}Appending #{a}")
+
+      Overwrite.new(source: a, content: content, context: context)
+
+      @output.puts(" succeeded.")
+    end
+
+    def within(directory: nil, source: join(@source, directory), destination: join(@destination, directory), &block)
+      @output.print "#{indentention}Within #{destination}"
+
+      self.class.new(source: source, destination: destination, output: @output, level: @level + 1, &block)
     end
 
-    def within(source: nil, destination: nil, &block)
-      ::Architecture::DSL.new(source: source(source), destination: destination(destination), &block)
+    private def source
+      @source
     end
 
-    def source(path)
-      join(@source, path)
+    private def destination
+      @destination
     end
 
-    def destination(path)
-      join(@destination, path)
+    private def join(*ids)
+      File.join(*ids)
     end
 
-    private def join(*paths)
-      ::File.join(*paths)
+    private def indentention
+      "\t" * @level
     end
   end
 end

data/lib/architecture/entity.rb

@@ -3,8 +3,10 @@ module Architecture
     DIRECTORY_MIMETYPE = "application/x-directory"
     DEFAULT_ENGINE = ::File
 
-    def initialize(path:)
-      @path = path
+    def initialize(id:, prefix:)
+      @id = id
+      @prefix = prefix
+      @path = ::File.join(@prefix, @id)
     end
 
     def location(engine: DEFAULT_ENGINE)

data/lib/architecture/move.rb

@@ -3,8 +3,8 @@ module Architecture
     include Replicatable
 
     def initialize(source:, destination:)
-      @origin = Entity.new(path: source)
-      @clone = Entity.new(path: destination)
+      @origin = source
+      @clone = destination
     end
 
     def call

data/lib/architecture/overwrite.rb

@@ -3,8 +3,8 @@ module Architecture
     include Entityable
     include Contentable
 
-    def initialize(source:, content: "", context: {})
-      @entity = Entity.new(path: source)
+    def initialize(source:, content: Architecture::EMPTY_CONTENT, context: Architecture::EMPTY_CONTEXT)
+      @entity = source
       @content = content
       @context = context
     end
@@ -13,7 +13,7 @@ module Architecture
       if entity.file?
         entity.write(text: data)
       else
-        raise ArgumentError, "Source wasn't a file"
+        raise(ArgumentError, "Source wasn't a file")
       end
     end
   end

data/lib/architecture/prepend.rb

@@ -3,8 +3,8 @@ module Architecture
     include Entityable
     include Contentable
 
-    def initialize(source:, content: "", context: {})
-      @entity = Entity.new(path: source)
+    def initialize(source:, content: Architecture::EMPTY_CONTENT, context: Architecture::EMPTY_CONTEXT)
+      @entity = source
       @content = content
       @context = context
     end
@@ -13,7 +13,7 @@ module Architecture
       if entity.file?
         entity.write(text: data)
       else
-        raise ArgumentError, "Source wasn't a file"
+        raise(ArgumentError, "Source wasn't a file")
       end
     end
 

data/lib/architecture/replace.rb

@@ -2,8 +2,8 @@ module Architecture
   class Replace
     include Entityable
 
-    def initialize(source:, search: "", content: "")
-      @entity = Entity.new(path: source)
+    def initialize(source:, search: Architecture::EMPTY_PATTERN, content: Architecture::EMPTY_CONTENT)
+      @entity = source
       @search = search
       @content = content
     end
@@ -12,7 +12,7 @@ module Architecture
       if entity.file?
         entity.write(text: content)
       else
-        raise ArgumentError, "Source wasn't a file"
+        raise(ArgumentError, "Source wasn't a file")
       end
     end
 

data/lib/architecture/version.rb

@@ -1,3 +1,3 @@
 module Architecture
-  VERSION = "5.2.1"
+  VERSION = "6.0.0"
 end

data/spec/lib/architecture/entity_spec.rb

@@ -1,12 +1,20 @@
 require "spec_helper"
 
 RSpec.describe Architecture::Entity do
+  let("id") do
+    "baz.rb"
+  end
+
+  let("prefix") do
+    "foo/bar"
+  end
+
   let("path") do
-    "foo/bar/baz"
+    "foo/bar/baz.rb"
   end
 
   let("entity") do
-    described_class.new(path: path)
+    described_class.new(id: id, prefix: prefix)
   end
 
   let("engine") do
@@ -42,16 +50,24 @@ RSpec.describe Architecture::Entity do
       entity.file?
     end
 
+    before(:each) do
+      allow(entity).to receive("type").and_return(type)
+    end
+
     context "when path points to a file" do
+      let("type") do
+        "application/x-file"
+      end
       it "returns true" do
-        allow(entity).to receive("type").and_return("application/x-file")
         expect(file?).to be(true)
       end
     end
 
     context "when path points to a directory" do
+      let("type") do
+        "application/x-directory"
+      end
       it "returns false" do
-        allow(entity).to receive("type").and_return("application/x-directory")
         expect(file?).to be(false)
       end
     end

data/spec/lib/architecture/version_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
-describe Architecture::VERSION do
-  it "should be a string" do
+RSpec.describe Architecture::VERSION do
+  it "is a string" do
     expect(Architecture::VERSION).to be_kind_of(String)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: architecture
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -142,7 +142,7 @@ files:
 - spec/lib/architecture/version_spec.rb
 - spec/lib/architecture_spec.rb
 - spec/spec_helper.rb
-homepage: http://krainboltgreene.github.io/architecture
+homepage: http://krainboltgreene.github.io/architecture.gem
 licenses:
 - MIT
 metadata: {}
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A DSL and object space for handling scaffolding