overapp 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTUyNDEwNWY4M2NlM2I4MjQ4M2RlMGY0NzMyM2YzYzQ0YmE4YWE4MQ==
+    ZWIyODU5Y2M4OWMyZTJkMzFmMDBjNGI3NDZhMmZlZGJhOTVkMDBhYQ==
   data.tar.gz: !binary |-
-    ODY2MjliZjgzYjU2MDk5ZTMxYzRmZTExZmU5NzA1NzAxNGM1NzdiMg==
+    NjA3Mjg0ZmFlNGVhMDgxNjc3NDFkMWM0Yjk3MTBiMDAyZDBkYWViYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzNhYTMwYWViNDA5ZDdiODdjZTkwZTFkNjRhNTYwNGE3Y2FiYmI5MjIyOTVl
-    NWNmMmY0NzllNmM1YWM1OWRhNzZjMjcwZTAxNWE1NTBlZjM5ZTliMTAyOTc1
-    OGVhMTgzNGRmMzBlMmY4ODdiMmNiYWE2ZDYyYWY5N2JhZmZjMDg=
+    MzU1NTQ4MTVkMTRiYWM3ZmRlOTU5ZWQ1YjE0NWIyMzA0YjI2ZDk5MjJmMmVm
+    ZTVlYjRkYTcwMTJkOWU0NjQzODg2ZDIxNTA3ZWFkNjBlMGY2ZWFjODg1ZGZm
+    MjBlMDExY2YxYmJjY2MzYWUxMzU1Y2RmNDkyZjljZWEzYTFhYjA=
   data.tar.gz: !binary |-
-    OWUyMDY2M2JiYWE3NDAxNzRmYmNiMTgzMzI3NjM4NzdkZjE5M2Y3N2U3NDAx
-    OWE0MjhhZjAyMTFiZmRhZTkwYWMxOGI0ZDg1MmEwOWE3YTg0ZTU2M2RhZGM4
-    Mzg1OGRjZmRhYjA1YWMyYWU5ZGU5YjRmZTE1YmI3NzBkZWQ5ODE=
+    YjcwMWZiODA2ZmMyZjY4ZTMyZjJiYjlmYjg3ZGQxZGVlMGM1N2UxOTQ5NWIy
+    NmJlNDMwNzNhMzgyYzcwZWIyYTJlZTg1NzU4NzE0ODk0YmRjNjE0YTM4MzNl
+    NmMwMDVlZGY3Y2I1YWYzMzZkNGE1OTA4NTkzNzJkYjYyMTVjZWM=

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/overapp

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-load File.dirname(__FILE__) + "/../lib/fs_template.rb"
+load File.dirname(__FILE__) + "/../lib/overapp.rb"
 
-FsTemplate.write_project ARGV[0],ARGV[1]
+Overapp.write_project ARGV[0],ARGV[1]

data/lib/overapp/files.rb

@@ -16,7 +16,10 @@ module Overapp
         existing = res.find { |x| x.path == top_file.path }
         if existing
           res -= [existing]
-          res << top_file.combined(existing)
+          new_file = top_file.combined(existing)
+          res << new_file if new_file
+        elsif top_file.has_note?
+          raise "cannot overlay onto missing file #{top_file.path}"
         else
           res << top_file
         end

data/lib/overapp/project.rb

@@ -97,6 +97,10 @@ module Overapp
       self.overapps << name
     end
 
+    def overlay(name)
+      overapp(name)
+    end
+
     def command(cmd,phase=:after)
       self.commands << {:command => cmd, :phase => phase}
     end

data/lib/overapp/template_file.rb

@@ -3,45 +3,73 @@ module Overapp
     include FromHash
     attr_accessor :path, :full_body
 
-    module NewWay
-      def split_note_and_body_long
-        if full_body =~ /<overapp>(.+)<\/overapp>/m
+    def split_note_and_body
+      res = []
+      remaining_body = full_body
+      while remaining_body
+        if remaining_body =~ /^<over(?:lay|app)>(.+)<\/over(?:lay|app)>(.*)(<over(?:lay|app)>.+)/m
           note = $1
-          rest = full_body.gsub(/<overapp>.+<\/overapp>/m,"")
-          {:note => note, :body => rest, :format => :long}
-        elsif full_body =~ /<overlay>(.+)<\/overlay>/m
+          rest = $2
+          remaining_body = $3
+          res << {:note => note, :body => rest}
+        elsif remaining_body =~ /^<over(?:lay|app)>(.+)<\/over(?:lay|app)>(.*)/m
           note = $1
-          rest = full_body.gsub(/<overlay>.+<\/overlay>/m,"")
-          {:note => note, :body => rest, :format => :long}
+          rest = $2
+          remaining_body = nil
+          res << {:note => note, :body => rest}
         else
-          nil
+          res << {:note => nil, :body => remaining_body}
+          remaining_body = nil
         end
       end
+      res
+    end
+
 
-      def note_params
-        res = {}
+    def note_params_single(one)
+      res = {}
+      note = one[:note]
+      res[:body] = one[:body]
+
+      if note
         lines = note.split("\n").select { |x| x.present? }
-        if lines.size == 1
+        if lines.size == 1 && !(lines.first =~ /action:/)
           res[:action] = lines.first.strip
         else
           lines.each do |line|
-            parts = line.split(":").map { |x| x.strip }.select { |x| x.present? }
+            parts = line.split(":").select { |x| x.present? }
+            if parts.size > 2
+              parts = [parts[0],parts[1..-1].join(":")]
+            end
+            parts = parts.map { |x| x.strip }
             raise "bad #{path} #{parts.inspect}" unless parts.size == 2
             res[parts[0].to_sym] = parts[1]
           end
         end
-        res
+      else
+        # do nothing
       end
+      res
+    end
 
+    def note_params
+      split_parts.map do |one|
+        note_params_single(one)
+      end
+    end
 
-      def apply_body_to_long(base_body)
-        params = note_params
-        if note == 'append'
+
+    def apply_body_to(base_body)
+      note_params.each do |params|
+        body = params[:body]
+        base_body = if params[:action].blank?
+          body
+        elsif params[:action] == 'append'
           base_body + body
         elsif params[:action] == 'insert' && params[:after]
           base_body.gsub(params[:after],"#{params[:after]}#{body}").tap do |subbed|
             if subbed == base_body
-              raise "no change, couldn't find #{params[:after]} in \n#{base_body}"
+              raise "no change, couldn't find #{params[:after]} to insert #{body} in \n#{base_body}"
             end
           end
         elsif params[:action] == 'insert' && params[:before]
@@ -53,73 +81,36 @@ module Overapp
         elsif params[:action] == 'replace' && params[:base]
           base_body.gsub(params[:base],body).tap do |subbed|
             if subbed == base_body
-              raise "no change, couldn't find #{params[:base]} in \n#{base_body}"
+              raise "no change, couldn't find #{params[:base]} to replace with #{body} in \n#{base_body}"
             end
           end
+        elsif params[:action] == 'delete'
+          :delete
         else
-          raise "bad"
-        end
-      end
-    end
-
-    module OldWay
-      def split_note_and_body_short
-        if full_body =~ /^FSTMODE:([a-z:0-9]+)\s/m
-          note = $1
-          rest = full_body.gsub(/^FSTMODE:#{note}/,"")
-          {:note => note, :body => rest, :format => :short}
-        else
-          nil
-        end
-      end
-
-      def apply_body_to_short(base_body)
-        note_parts = note.to_s.split(":")
-        if note == 'append'
-          base_body + body
-        elsif note_parts[0] == 'insert'
-          raise "bad" unless note_parts[1] == 'line'
-          base_lines = base_body.split("\n")
-          i = note_parts[2].to_i - 1
-          base_lines[0...i].join("\n") + body + base_lines[i..-1].join("\n")
-        else
-          raise "unknown note #{note}"
+          raise "bad #{params.inspect}"
         end
       end
+      base_body
     end
 
-    include OldWay
-    include NewWay
-
-    def split_note_and_body
-      [:split_note_and_body_short,:split_note_and_body_long].each do |meth|
-        res = send(meth)
-        return res if res
-      end
-      {:note => nil, :body => full_body}
+    fattr(:split_parts) { split_note_and_body }   
+    def has_note?
+      split_parts.any? { |x| x[:note].present? }
     end
 
-    fattr(:split_parts) { split_note_and_body }
-
-    fattr(:body) { split_parts[:body] }
-    fattr(:note) { split_parts[:note] }
-    fattr(:format) { split_parts[:format] }
+    def body
+      full_body
+    end 
 
-    def apply_body_to(base_body)
-      if note.present?
-        m = "apply_body_to_#{format}"
-        send(m,base_body)
+    def combined(base)
+      b = apply_body_to(base.full_body)
+      if b == :delete
+        nil
       else
-        body
+        self.class.new(:path => path, :full_body => b)
       end
     end
 
-    
-
-    def combined(base)
-      self.class.new(:path => path, :full_body => apply_body_to(base.body))
-    end
-
     def write_to!(dir)
       raise "bad path" if path.blank?
       d = File.dirname("#{dir}/#{path}")

data/overapp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "overapp"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]

data/spec/overapp_spec.rb

@@ -57,12 +57,14 @@ describe "dotfile" do
   end
 end
 
-describe "combine - append" do
+
+
+describe "combine - append format2" do
   include_context "setup"
 
   base_file "a.txt","stuff"
   base_file "b.txt","here"
-  on_top_file "b.txt","FSTMODE:append\nother"
+  on_top_file "b.txt","<overapp>append</overapp>\nother"
 
   it 'combined size' do
     combined.size.should == 2
@@ -74,12 +76,12 @@ describe "combine - append" do
   end
 end
 
-describe "combine - append format2" do
+describe "combine - insert after" do
   include_context "setup"
 
   base_file "a.txt","stuff"
-  base_file "b.txt","here"
-  on_top_file "b.txt","<overapp>append</overapp>\nother"
+  base_file "b.txt","123\n456\n789"
+  on_top_file "b.txt","<overapp>action: insert\nafter: 456</overapp>\nabc"
 
   it 'combined size' do
     combined.size.should == 2
@@ -87,16 +89,16 @@ describe "combine - append format2" do
 
   it 'combined file should overwrite' do
     f = combined.files.find { |x| x.path == "b.txt" }
-    f.body.should == "here\nother"
+    f.body.should == "123\n456\nabc\n789"
   end
 end
 
-describe "combine - insert" do
+describe "combine - insert after with colon" do
   include_context "setup"
 
   base_file "a.txt","stuff"
-  base_file "b.txt","a\nb\nc\nd"
-  on_top_file "b.txt","FSTMODE:insert:line:2\nother\n"
+  base_file "b.txt","123\n45: 6\n789"
+  on_top_file "b.txt","<overapp>action: insert\nafter: 45: 6</overapp>\nabc"
 
   it 'combined size' do
     combined.size.should == 2
@@ -104,16 +106,16 @@ describe "combine - insert" do
 
   it 'combined file should overwrite' do
     f = combined.files.find { |x| x.path == "b.txt" }
-    f.body.should == "a\nother\nb\nc\nd"
+    f.body.should == "123\n45: 6\nabc\n789"
   end
 end
 
-describe "combine - insert after" do
+describe "combine - insert before" do
   include_context "setup"
 
   base_file "a.txt","stuff"
   base_file "b.txt","123\n456\n789"
-  on_top_file "b.txt","<overapp>action: insert\nafter: 456</overapp>\nabc"
+  on_top_file "b.txt","<overapp>action: insert\nbefore: 456</overapp>abc\n"
 
   it 'combined size' do
     combined.size.should == 2
@@ -121,16 +123,28 @@ describe "combine - insert after" do
 
   it 'combined file should overwrite' do
     f = combined.files.find { |x| x.path == "b.txt" }
-    f.body.should == "123\n456\nabc\n789"
+    f.body.should == "123\nabc\n456\n789"
   end
 end
 
-describe "combine - insert before" do
+describe "combine - delete" do
   include_context "setup"
 
   base_file "a.txt","stuff"
   base_file "b.txt","123\n456\n789"
-  on_top_file "b.txt","<overapp>action: insert\nbefore: 456</overapp>abc\n"
+  on_top_file "b.txt","<overapp>action: delete\n</overapp>abc\n"
+
+  it 'combined size' do
+    combined.size.should == 1
+  end
+end
+
+describe "combine - multiple directives" do
+  include_context "setup"
+
+  base_file "a.txt","stuff"
+  base_file "b.txt","123\n456\n789"
+  on_top_file "b.txt","<overapp>action: replace\nbase: 123\n</overapp>abc<overapp>action: replace\nbase: 456\n</overapp>def"
 
   it 'combined size' do
     combined.size.should == 2
@@ -138,7 +152,7 @@ describe "combine - insert before" do
 
   it 'combined file should overwrite' do
     f = combined.files.find { |x| x.path == "b.txt" }
-    f.body.should == "123\nabc\n456\n789"
+    f.body.should == "abc\ndef\n789"
   end
 end
 
@@ -171,13 +185,13 @@ describe "combine - top file in new dir" do
   end
 end
 
-describe "combine - error" do
+describe "combine - insert to nothing" do
   include_context "setup"
 
-  base_file "a.txt","stuff"
-  on_top_file "a.txt","FSTMODE:fgdfgdfg\nstuff"
+  on_top_file "b.txt","<overapp>action: insert\nafter: 456</overapp>abc"
 
-  it 'combined size' do
+  it 'errors' do
     lambda { combined.size }.should raise_error
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overapp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mike Harris