fs_template 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJjZDU4ODM0MjgxMzk5Y2U0M2Q3OGQwZmU4OGYxNzA2ZWIzNjE0OA==
+    YmUxYzM1OGE1OTVjZGY3MDc5YWZlMzc3NjY2MGQwYmRjNGQ4ZWQ0ZA==
   data.tar.gz: !binary |-
-    YThjNDQ1OGFkOTY1NmQ2NTkxMzk3MDkyMzlmNWZiNGJiOTFkNTFhNQ==
+    M2I0M2IyZWRjNTIxYjY3ZjdjYzY5NDBjMGMyNjQ1ZjRmNDhmYTdlYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmNmNTc3NzhlOTk0NTY5YWE5YzZhNTU0YjUxMzBmODQ4OGVkMjYxMDMwNjlm
-    MTAzNjA1NGVlYWMyZjZlYWFiZDcyYmY3YjAyYTQ5ODc0YzVkNjY0NmU4ZDFk
-    NTM0ODIxNzkzNDMzMTQyZGZiNTA3MDMyZTRlNDhhNjNjYjA3NWU=
+    NzczZjQ1MWMzM2VjZjczZWZkYWYzYWY2MmI1NTZkZTc5NjlmYzkyMTBjZWE0
+    YzZjZWY4MDAyYzNjOGE3NDVhZGE2M2I1MGE3MDBhMDY5OTcyZGNiMjFiZjU5
+    NzY5NTU3NWE0NjAxNWU5ZWQzYzRiYzVmNWNiNTA4YWU0M2Y0MjE=
   data.tar.gz: !binary |-
-    MDczNmVkODZlY2NlN2IxN2YzNjg0YTRlNDI3YjlmYTlkODVmZDYxZmE5YTZh
-    YmFjODlmMDNlYTkzMWI3NTllY2M1MTFmZGYwNTI2OWE4NTdmNmFlOTUyZmVm
-    ZTJkNWQ2YmQ5YmEwYzcwNzRhOTRlMGYxYjc3NTcyYjliNDVlZDQ=
+    NmE3MmIzYjk1ZTBkOGMwYzE5ZDYzN2MxNWE4MzJiN2ViOTI2ZTQ4YTQzODli
+    MGE3NDI2YjUwMjA4M2RkYTU2ZjI0MDBhMTcxMTFjOTZmMGU5MzZlNzA2NGJj
+    MmQ4MWY1YTU1ODM2Yjg3OWIxNGMzNzczZmJjOWMwZDllNTEwZTY=

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/fs_template.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fs_template"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
-  s.date = "2013-11-01"
+  s.date = "2013-11-07"
   s.description = "fs_template"
   s.email = "mharris717@gmail.com"
   s.executables = ["fs_template"]
@@ -31,9 +31,11 @@ Gem::Specification.new do |s|
     "fs_template.gemspec",
     "lib/fs_template.rb",
     "lib/fs_template/files.rb",
+    "lib/fs_template/from_command.rb",
     "lib/fs_template/project.rb",
     "lib/fs_template/template_file.rb",
     "lib/fs_template/thor_file.rb",
+    "spec/from_command_spec.rb",
     "spec/fs_template_spec.rb",
     "spec/input/top/.overlay",
     "spec/input/top/b.txt",

data/lib/fs_template.rb

@@ -1,13 +1,38 @@
 require 'mharris_ext'
 
-%w(files template_file thor_file project).each do |f|
+%w(files template_file thor_file project from_command).each do |f|
   load File.dirname(__FILE__) + "/fs_template/#{f}.rb"
 end
 
 module FsTemplate
   class << self
+    def with_repo_path(url)
+      dir = "/tmp/#{rand(100000000000000000000)}"
+      `mkdir #{dir}`
+      Dir.chdir(dir) do
+        `git clone #{url} .`
+      end
+      yield dir
+    ensure
+      `rm -rf #{dir}`
+    end
+    def with_local_path(overlay_path,&b)
+      if overlay_path =~ /git/
+        with_repo_path(overlay_path) do |dir|
+          b[dir]
+        end
+      else
+        yield overlay_path
+      end
+    end
     def write_project(overlay_path,output_path)
-      FsTemplate::Project.new(:path => overlay_path).write_to!(output_path)
+      with_local_path(overlay_path) do |dir|
+        FsTemplate::Project.new(:path => dir).write_to!(output_path)
+      end
+    end
+
+    def ec(cmd,ops={})
+      `#{cmd}`
     end
   end
 end

data/lib/fs_template/files.rb

@@ -1,6 +1,7 @@
 module FsTemplate
   class Files
     include FromHash
+    include Enumerable
     fattr(:files) { [] }
     fattr(:file_class) { TemplateFile }
     def add(ops)
@@ -37,10 +38,11 @@ module FsTemplate
         res = Dir["#{dir}/**/*"] + Dir["#{dir}/**/.*"]
         res - [".","..",".git"]
       end
-      def load_dir(dir)
+      def load_dir(dir,ops={})
         raise "Bad dir" unless dir.present?
-        raise "Dir not there" unless FileTest.exist?(dir)
+        raise "Dir not there #{dir}" unless FileTest.exist?(dir)
         res = new
+        res.file_class = ops[:file_class] if ops[:file_class]
         dir_files(dir).each do |full_file|
           if FileTest.file?(full_file)
             f = full_file.gsub("#{dir}/","")
@@ -51,12 +53,18 @@ module FsTemplate
         res
       end
 
-      def load(descriptor)
+      def load_command(cmd,ops)
+        FromCommand.new(:command => cmd, :path => ops[:path]||".").files
+      end
+
+      def load(descriptor, ops={})
         raise "bad #{descriptor}" if descriptor.blank?
-        if descriptor =~ /\.git/
+        if ops[:type] == :command
+          load_command(descriptor,ops)
+        elsif descriptor =~ /\.git/
           load_repo(descriptor)
         else
-          load_dir(descriptor)
+          load_dir(descriptor,ops)
         end
       end
 

data/lib/fs_template/from_command.rb

@@ -0,0 +1,23 @@
+module FsTemplate
+  class FromCommand
+    include FromHash
+    attr_accessor :command, :path
+
+    def with_tmp_dir
+      dir = "/tmp/#{rand(1000000000000000000)}"
+      `mkdir #{dir}`
+      Dir.chdir(dir) do
+        yield dir
+      end
+    ensure
+      ec "rm -rf #{dir}", :silent => true
+    end
+
+    fattr(:files) do
+      with_tmp_dir do |dir|
+        FsTemplate.ec command, :silent => true
+        Files.load [dir,path].select { |x| x.present? }.join("/"), :file_class => BasicFile
+      end
+    end
+  end
+end

data/lib/fs_template/project.rb

@@ -24,12 +24,20 @@ module FsTemplate
       config.overlays + [path]
     end
 
+    def commands(phase)
+      config.commands.select { |x| x[:phase] == phase }.map { |x| x[:command] }
+    end
+
     fattr(:overlays) do
       overlay_paths.map { |x| Files.load(x) }
     end
 
     fattr(:base_files) do
-      Files.load(config.base)
+      if config.base
+        Files.load(config.base,config.base_ops)
+      else
+        nil
+      end
     end
 
     fattr(:combined_files) do
@@ -40,27 +48,46 @@ module FsTemplate
       res
     end
 
+    def git_commit(output_path,message,init=false)
+      if init
+        `rm -rf #{output_path}/.git`
+        ec "cd #{output_path} && git init && git config user.email johnsmith@fake.com && git config user.name 'John Smith'", :silent => true
+      end
+      ec "cd #{output_path} && git add . && git commit -m '#{message}'", :silent => true
+    end
+
+
     def write_to!(output_path)
+      commands(:before).each do |cmd|
+        FsTemplate.ec "cd #{output_path} && #{cmd}", :silent => true
+        git_commit output_path, "Ran Command: #{cmd}"
+      end
+
       base_files.write_to! output_path
-      `rm -rf #{output_path}/.git`
 
-      full_init = 'git init && git config user.email johnsmith@fake.com && git config user.name "John Smith"'
-      ec "cd #{output_path} && #{full_init} && git add . && git commit -m 'Base Files #{config.base}'", :silent => true
+      git_commit output_path, "Base Files #{config.base}", true
       combined_files.write_to!(output_path)
-      ec "cd #{output_path} && git add . && git commit -m 'Overlay Files #{path}'", :silent => true
+      git_commit output_path, "Overlay Files #{path}"
+
+      commands(:after).each do |cmd|
+        FsTemplate.ec "cd #{output_path} && #{cmd}", :silent => true
+        git_commit output_path, "Ran Command: #{cmd}"
+      end
     end
   end
 
   class ProjectConfig
     include FromHash
-    attr_accessor :body, :base
+    attr_accessor :body, :base, :base_ops
     fattr(:overlays) { [] }
+    fattr(:commands) { [] }
 
     def base(*args)
       if args.empty?
         @base
       else
         @base = args.first
+        @base_ops = args[1] || {}
       end
     end
 
@@ -68,6 +95,10 @@ module FsTemplate
       self.overlays << name
     end
 
+    def command(cmd,phase=:after)
+      self.commands << {:command => cmd, :phase => phase}
+    end
+
     def load!
       c = self
       eval(body)

data/lib/fs_template/template_file.rb

@@ -22,7 +22,7 @@ module FsTemplate
         else
           lines.each do |line|
             parts = line.split(":").map { |x| x.strip }.select { |x| x.present? }
-            raise "bad" unless parts.size == 2
+            raise "bad #{path} #{parts.inspect}" unless parts.size == 2
             res[parts[0].to_sym] = parts[1]
           end
         end
@@ -40,6 +40,12 @@ module FsTemplate
               raise "no change, couldn't find #{params[:after]} in \n#{base_body}"
             end
           end
+        elsif params[:action] == 'insert' && params[:before]
+          base_body.gsub(params[:before],"#{body}#{params[:before]}").tap do |subbed|
+            if subbed == base_body
+              raise "no change, couldn't find #{params[:before]} in \n#{base_body}"
+            end
+          end
         elsif params[:action] == 'replace' && params[:base]
           base_body.gsub(params[:base],body).tap do |subbed|
             if subbed == base_body
@@ -117,4 +123,10 @@ module FsTemplate
       File.create "#{dir}/#{path}",body
     end
   end
+
+  class BasicFile < TemplateFile
+    def body
+      full_body
+    end
+  end
 end

data/spec/from_command_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'FromCommand' do
+  let(:command) do
+    "mkdir abc && cd abc && echo stuff > abc.txt"
+  end
+
+  let(:from_command) do
+    FsTemplate::FromCommand.new(:command => command, :path => "abc")
+  end
+
+  it 'files' do
+    from_command.files.size.should == 1
+    from_command.files.first.path.should == 'abc.txt'
+    from_command.files.first.full_body.strip.should == 'stuff'
+  end
+end

data/spec/fs_template_spec.rb

@@ -125,6 +125,23 @@ describe "combine - insert after" do
   end
 end
 
+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","<overlay>action: insert\nbefore: 456</overlay>abc\n"
+
+  it 'combined size' do
+    combined.size.should == 2
+  end
+
+  it 'combined file should overwrite' do
+    f = combined.files.find { |x| x.path == "b.txt" }
+    f.body.should == "123\nabc\n456\n789"
+  end
+end
+
 describe "combine - replace" do
   include_context "setup"
 

data/spec/project_note_spec.rb

@@ -62,6 +62,89 @@ describe 'Project' do
   end
 end
 
+describe 'Project with command' do
+  let(:config_body) do
+    "c.base :foo
+    c.overlay :bar
+    c.command 'ls'"
+  end
+
+  let(:project) do
+    res = FsTemplate::Project.new(:path => "/fun")
+    res.stub(:config_body) { config_body }
+    res
+  end
+
+  before do
+    FsTemplate::Files.stub(:load) { FsTemplate::Files.new }
+  end
+
+  it 'commands' do
+    project.commands(:after).should == ["ls"]
+  end
+end
+
+describe 'Project order' do
+  let(:config_body) do
+    "c.base :foo
+    c.overlay :bar
+    c.command 'ls'"
+  end
+
+  let(:project) do
+    res = FsTemplate::Project.new(:path => "/tmp/a/b/c/fun")
+    res.stub(:config_body) { config_body }
+    res
+  end
+
+  before do
+    FsTemplate::Files.stub(:load) { FsTemplate::Files.new }
+  end
+
+  it 'write' do
+    output_path = "/tmp/f/t/r/r"
+
+    FsTemplate.should_receive(:ec).with("cd #{output_path} && ls", :silent => true)
+    project.stub(:git_commit)
+    project.combined_files.stub("write_to!")
+
+    project.write_to! output_path
+  end
+end
+
+describe 'Project with no base' do
+  let(:config_body) do
+    "c.base 'mkdir foo && echo stuff > foo/abc.txt', :type => :command, :path => :foo"
+  end
+
+  let(:output_path) do
+    res = "/tmp/#{rand(1000000000000000)}"
+    `mkdir #{res}`
+    res
+  end
+
+  after do
+    `rm -rf #{output_path}`
+  end
+
+  let(:project) do
+    res = FsTemplate::Project.new(:path => "/tmp/a/b/c/fun")
+    res.stub(:config_body) { config_body }
+    res
+  end
+
+  it 'write' do
+    #FsTemplate.should_receive(:ec).with("echo stuff > abc.txt", :silent => true)
+    project.stub(:git_commit)
+    project.stub(:overlay_paths) { [] }
+
+    project.write_to! output_path
+
+    File.read("#{output_path}/abc.txt").strip.should == 'stuff'
+  end
+end
+
+
 describe "write project" do
   include_context "output dir"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fs_template
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext
@@ -186,9 +186,11 @@ files:
 - fs_template.gemspec
 - lib/fs_template.rb
 - lib/fs_template/files.rb
+- lib/fs_template/from_command.rb
 - lib/fs_template/project.rb
 - lib/fs_template/template_file.rb
 - lib/fs_template/thor_file.rb
+- spec/from_command_spec.rb
 - spec/fs_template_spec.rb
 - spec/input/top/.overlay
 - spec/input/top/b.txt