rake-distribute 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 737d4756f5ae05c91a2ff775460e8573358efc0c
-  data.tar.gz: c95e5e0d7f65adb3cd0db544eb7440184e5eb5ad
+  metadata.gz: ce2dbd83ebaa19f8c11fb744f1fc479cf6765a19
+  data.tar.gz: 9e5df700225fdc65df089017cba53b1ba4ea6d47
 SHA512:
-  metadata.gz: ecf6155ec517a9cc6fcddaa083ed2cf71f5c88c26bf092ba368fea90e8dc88ce337c7f9431a3c96eb20473e7e13cc9272be85df00f4bcae84f6c2eb174067d61
-  data.tar.gz: 2559b2e8dcb1cf549df2eda5d79bbd77655f632e17581aa7dc22982f3baae23a2a7555178305d9e0ba603bd98ded1d6fa5c407ff4f8db39a701c4ab66e77f667
+  metadata.gz: 61b0b234ee103ddf36a85a644c1de478faee9681bea1108e09a25e699bf7ace6613db7dc647176acea90ccb2815ff5addd27f9cb6eea8e63d8f35d65e2ec16ad
+  data.tar.gz: 43430190dc530898480533557255d102d42a1f17ed5d3781e98073fb10becd2ced408cafe558f3089d4da2e273010b1febfa41fc358a013e7c744e6a29d21f0e

data/README.md

@@ -18,6 +18,8 @@ It is the saver to use rake tasks to manage 1 -> n file distribution. Commonly a
 
 ## SYNOPSIS:
 
+### Basic Usage
+
 ```ruby
 distribute :FileItem do
   from "/path/from"
@@ -25,19 +27,36 @@ distribute :FileItem do
 end
 
 distribute :ErbFile do
-  build_dir "build/distribute"
-  from "/path/from"
+  build_dir "build/distribute" # optional
+  from "/path/from.erb"
   to "/path/to"
-  with_context {:a => 1, :b => 2}
+  with_context {:a => 1, :b => 2} # optional
+  diff do |dest, src| # optional
+    sh %Q{vimdo diff "#{dest}" "#{src}"}
+  end
 end
 
 distribute :TiltFile do
-  prefer Tilt::BlueClothTemplate
+  prefer Tilt::BlueClothTemplate # optional
   from "/path/from"
   to "/path/to"
-  with_context {:a => 1, :b => 2}
+  with_context {:a => 1, :b => 2} # optional
 end
 ```
+### Include Simple Build Proc
+
+```ruby
+distribute :FileItem do
+  build_dir "build/distribute" # optional
+  from "/path/from.c"
+  build :to => 'to' do |from, to|
+    sh %Q{gcc "#{from}" -o "#{to}"}
+  end
+  to "/usr/bin/to"
+end
+
+```
+
 
 ## DEVELOPERS:
 

data/lib/rake/distribute/item.rb

@@ -20,17 +20,18 @@ module Rake::Distribute
         @src = source
       end
 
-      def to(dest, options={})
+      def to(dest, options = {})
+        @dest_options = options
         @dest = dest
       end
 
+
       def diff(&block)
         raise NotImplementedError
       end
 
       def sanity?
-        raise SyntaxError, "from: is not defined" unless defined? @src
-        raise SyntaxError, "to: is not defined" unless defined? @dest
+        raise SyntaxError, "source: is not defined" unless defined? @src
       end
 
       def define_tasks

data/lib/rake/distribute/item/erbfile.rb

@@ -16,79 +16,41 @@ module Rake::Distribute
     class ErbFile < FileItem
       def initialize(&block)
         @context   = {}
-        @build_dir = File.join('build','distribute')
         super
-      end
-
-      def sanity?
-        super
-        raise ArgumentError, "#{@src} does not exist!" unless File.exists?(@src)
-      end
-
-      def build_dir(folder)
-        @build_dir = folder
+         
+        # if the user do not define build task
+        @build_proc ||= Proc.new { |from, to|
+          # unnecessary dup to make the workflow clear
+          copy_entry from, to
+        }
       end
 
       def with_context(context)
         @context = context
       end
 
-      def define_build_task(options={})
-        directory @build_dir
-
-        build_file = File.join(@build_dir,
-                               "#{Item.sn.to_s}-#{@src.pathmap('%n')}")
-        file build_file => @src do
-          File.open(build_file, 'w') do |f|
-            erb = ERB.new(File.read(@src))
-            f.write(erb.result(ContextStruct.new(@context).get_binding))
-            f.flush
-          end
+      def render(from, to)
+        File.open(to, 'w') do |f|
+          erb = ERB.new(File.read(from))
+          f.write(erb.result(ContextStruct.new(@context).get_binding))
+          f.flush
         end
-        build_file
       end
 
-      def define_tasks(options={})
-
-        dest_dir = @dest.pathmap("%d")
-        directory dest_dir
-
-        build_file = define_build_task(options)
-
-
-        file @dest => build_file do
-          install build_file, @dest, @dest_options
-        end
-
-        desc "distribute: build"
-        task :build => [@build_dir, build_file]
-        
-        desc "distribute: install"
-        task :install => [@build_dir, build_file, dest_dir, @dest]
-
-        desc "distribute: uninstall"
-        task :uninstall do
-          safe_unlink @dest if File.exists?(@dest)
+      alias_method :super_define_build_task, :define_build_task
+      def define_build_task(src)
+        directory @build_dir
+        render_dest = File.join(@build_dir,
+                                "#{Item.sn.to_s}-#{@src.pathmap('%n')}")
+        file render_dest => [@src, @build_dir] do
+          render(@src, render_dest)
         end
 
         desc "distribute: clean"
         task :clean do
-          safe_unlink build_file if File.exists?(build_file)
-        end
-
-        desc "distribute: clobber"
-        task :clobber => [:clean] do
-          rmdir @build_dir
-        end
-
-        desc "distribute: diff"
-        task :diff => [@build_dir, build_file] do
-          diff = Diffy::Diff.new(
-            @dest, build_file, :source => 'files', :allow_empty_diff => true
-          ).to_s(:text)
-
-          @diff_proc.call(@dest, @src) unless diff.empty?
+          safe_unlink render_dest
         end
+        super_define_build_task(render_dest)
       end
 
     end

data/lib/rake/distribute/item/file.rb

@@ -7,6 +7,7 @@ module Rake::Distribute
     class FileItem < Base
       def initialize(&block)
         @diff_proc = Proc.new {|dest,src| puts "#{dest} differs from #{src}"}
+        @build_dir = File.join('build','distribute')
         super
       end
 
@@ -15,40 +16,133 @@ module Rake::Distribute
         raise ArgumentError, "#{@src} does not exist!" unless File.exists?(@src)
       end
 
-      def to(dest, options={})
-        @dest = dest
-        @dest_options = options
+      def build(options = {}, &block)
+        @build_options = options
+        @build_proc = block if block_given?
+      end
+
+      def build_dir(folder)
+        @build_dir = folder
       end
 
       def diff(&block)
         @diff_proc = block if block_given?
       end
 
+
       def define_tasks(options={})
-        dest_folder = @dest.pathmap("%d")
-        directory dest_folder
-        file @dest => @src do
-          install @src, @dest, @dest_options
+        if defined? @build_proc
+          build_dest = define_build_task(@src)
+        else
+          build_dest = nil
         end
 
-        desc "distribute: install"
-        task :install => [dest_folder, @dest]
+        if defined? @dest
+          if File.directory?(@dest)
+            dest_folder = @dest
+          else
+            dest_folder = @dest.pathmap("%d")
+            directory dest_folder
+            file @dest => dest_folder
+          end
+
+          if build_dest
+
+            file @dest => build_dest do
+              if File.directory?(build_dest)
+                cp_r build_dest, @dest, @dest_options
+              else
+                install build_dest, @dest, @dest_options
+              end
+            end
+
+            desc "distribute: install"
+            task :install => @dest
+
+
+            define_diff_task(build_dest)
+
+          else # without build ( install @src -> @dest )
+            file @dest => @src do
+              if File.directory?(@dest)
+                cp_r @src, @dest, @dest_options
+              else
+                install @src, @dest, @dest_options
+              end
+            end
+
+            desc "distribute: install"
+            task :install => @dest
+
+            define_diff_task(@src)
+          end
+
+          desc "distribute: uninstall"
+          task :uninstall do
+            if File.directory?(@dest)
+              rmtree File.join(@dest, File.basename(@dest))
+            else
+              safe_unlink @dest
+            end
+          end
+
 
-        desc "distribute: uninstall"
-        task :uninstall do
-          safe_unlink @dest
         end
 
+      end
+
+
+      def define_diff_task(from)
+        return unless defined? @dest
+
         desc "distribute: diff"
         task :diff do
           diffy = Diffy::Diff.new(
-            @dest, @src, :source => 'files', :allow_empty_diff => true
+            @dest, from, :source => 'files', :allow_empty_diff => true
           ).to_s(:text)
 
           @diff_proc.call(@dest, @src) unless diffy.empty?
         end
       end
 
+
+      def define_build_task(from)
+
+        build_dest = File.join(@build_dir, build_to)
+
+        build_dir = File.dirname(build_dest)
+        directory build_dir
+        file build_dest => [from, build_dir] do
+          @build_proc.call(from, build_dest)
+        end
+        desc "distribute: build"
+        task :build => build_dest
+
+        desc "distribute: clean"
+        task :clean do
+          safe_unlink build_dest
+        end
+
+        desc "distribute: clobber"
+        task :clobber => [:clean] do
+          rmdir @build_dir
+        end
+
+        build_dest
+      end
+
+      private
+
+
+
+      def build_to
+        if @build_options and @build_options.has_key?(:to)
+          @build_options[:to]
+        else
+          "#{Item.sn.to_s}-#{@src.pathmap('%n')}"
+        end
+      end
+
     end
 
   end

data/lib/rake/distribute/item/tiltfile.rb

@@ -9,7 +9,6 @@ module Rake::Distribute
 
     class TiltFile < ErbFile
       def initialize(&block)
-        Tilt.prefer Tilt::ErubisTemplate
         super
       end
 
@@ -22,23 +21,15 @@ module Rake::Distribute
 
       end
 
-      def define_build_task(options={})
-        directory @build_dir
-
-        build_file = File.join(@build_dir,
-                               "#{Item.sn.to_s}-#{@src.pathmap('%n')}")
-        file build_file => @src do
-          File.open(build_file, 'w') do |f|
-            tilt = Tilt.new(@src)
-            f.write(tilt.render(ContextStruct.new(@context)))
-            f.flush
-          end
+      def render(from, to)
+        File.open(to, 'w') do |f|
+          tilt = Tilt.new(from)
+          f.write(tilt.render(ContextStruct.new(@context)))
+          f.flush
         end
-        build_file
       end
 
     end
-
   end
 end
 

data/lib/rake/distribute/version.rb

@@ -1,3 +1,3 @@
 module Rake::Distribute
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-distribute
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Zhao Cai
@@ -30,7 +30,7 @@ cert_chain:
   eIuFwYbmfyt5/ObUtmp3BlaIStTiX9TBWeuTx6Zq6q6wDzcudbDRd+jLa2XG2AGB
   S6w/KYMnbhUxfyEU1MX10sJv87WIrtgF
   -----END CERTIFICATE-----
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake