rake-distribute 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c6ad4b2a387c85f4422d91c5c091d46f1eec338a
+  data.tar.gz: 76aa433d5e1d344749d604e26097473aa56e4b4d
+SHA512:
+  metadata.gz: f7edf209195e045e9409554216b65fb1196153922a86e1d8b3f92d62646fe13d7d21d22af184f60c441de7a6e1d22ce7f5ab8a76ea03a53fab947947f02af5c5
+  data.tar.gz: 1ff4fdc6d3e4a1d847e0c018474a7d1722241bb76d6f5b1a1568b3764549c9955e642b564e2e75100ea9582d84cb3025683f47718afe5e33a1e1cf0dd6805864

data/History.txt

@@ -1,3 +1,12 @@
+=== 1.2.0 / 2012-10-24
+
+  * remove extra :distribute namespace
+  * add monkey patch to fix duplicated task desc
+
+=== 1.1.0 / 2012-10-24
+  * add ErbContext class
+
+
 === 1.0.0 / 2012-10-24
 
 * 3 minor enhancement

data/Manifest.txt

@@ -11,6 +11,7 @@ lib/rake/distribute/error.rb
 lib/rake/distribute/item.rb
 lib/rake/distribute/item/erbfile.rb
 lib/rake/distribute/item/file.rb
+lib/rake/distribute/task.rb
 lib/rake/distribute/version.rb
 rake-distribute.gemspec
 test/minitest_helper.rb

data/lib/rake/distribute.rb

@@ -5,6 +5,10 @@ require 'rake'
 require 'diffy'
 require 'rake/distribute/version'
 
+# monkey patch
+require 'rake/distribute/task'
+
+
 require 'rake/distribute/core'
 require 'rake/distribute/dsl'
 

data/lib/rake/distribute/core.rb

@@ -15,35 +15,12 @@ module Rake::Distribute
 
     def initialize
       @items = []
-
-      # unify task descriptions
-      namespace :distribute do
-        desc "distribute"
-        task :install
-
-        desc "build for distribution"
-        task :build
-
-        desc "clean temporary items"
-        task :clean
-
-        desc "clean all unnecessary items"
-        task :clobber => :clean
-
-        desc "diff the distributed from the source"
-        task :diff
-
-        desc "uninstall the distributed"
-        task :uninstall
-      end
-      task :clean => "distribute:clean"
-      task :clobber => "distribute:clobber"
     end
 
-    def distribute(item_class, &block)
+    def distribute(item_class, options={}, &block)
       item = get_item_class(item_class).new(&block)
       item.sanity?
-      item.define_tasks
+      item.define_tasks(options)
       @items << item
     end
 

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

@@ -33,48 +33,54 @@ module Rake::Distribute
         @context = context
       end
 
-      def define_tasks
-        namespace "distribute" do
-          dest_dir = @dest.pathmap("%d")
-          directory dest_dir
-          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(ErbContext.new(@context).get_binding))
-              f.flush
-            end
+      def define_tasks(options={})
+
+        dest_dir = @dest.pathmap("%d")
+        directory dest_dir
+        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(ErbContext.new(@context).get_binding))
+            f.flush
           end
+        end
 
-          file @dest => build_file do
-            install build_file, @dest, @dest_options
-          end
+        file @dest => build_file do
+          install build_file, @dest, @dest_options
+        end
 
-          task :build => [@build_dir, build_file]
-          task :install => [@build_dir, build_file, dest_dir, @dest]
+        desc "distribute: build"
+        task :build => [@build_dir, build_file]
+        
+        desc "distribute: install"
+        task :install => [@build_dir, build_file, dest_dir, @dest]
 
-          task :uninstall do
-            safe_unlink @dest if File.exists?(@dest)
-          end
+        desc "distribute: uninstall"
+        task :uninstall do
+          safe_unlink @dest if File.exists?(@dest)
+        end
 
-          task :clean do
-            safe_unlink build_file if File.exists?(build_file)
-          end
+        desc "distribute: clean"
+        task :clean do
+          safe_unlink build_file if File.exists?(build_file)
+        end
 
-          task :clobber => [:clean] do
-            rmdir @build_dir
-          end
+        desc "distribute: clobber"
+        task :clobber => [:clean] do
+          rmdir @build_dir
+        end
 
-          task :diff => [@build_dir, build_file] do
-            diff = Diffy::Diff.new(
-              @dest, build_file, :source => 'files', :allow_empty_diff => true
-            ).to_s(:text)
+        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, build_file) unless diff.empty?
-          end
+          @diff_proc.call(@dest, build_file) unless diff.empty?
         end
       end
 

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

@@ -24,27 +24,28 @@ module Rake::Distribute
         @diff_proc = block if block_given?
       end
 
-      def define_tasks
-        namespace "distribute" do
-          dest_folder = @dest.pathmap("%d")
-          directory dest_folder
-          file @dest => @src do
-            install @src, @dest, @dest_options
-          end
-
-          task :install => [dest_folder, @dest]
-
-          task :uninstall do
-            safe_unlink @dest
-          end
-
-          task :diff do
-            diff = Diffy::Diff.new(
-              @dest, @src, :source => 'files', :allow_empty_diff => true
-            ).to_s(:text)
-
-            @diff_proc.call(@dest, @src) unless diff.empty?
-          end
+      def define_tasks(options={})
+        dest_folder = @dest.pathmap("%d")
+        directory dest_folder
+        file @dest => @src do
+          install @src, @dest, @dest_options
+        end
+
+        desc "distribute: install"
+        task :install => [dest_folder, @dest]
+
+        desc "distribute: uninstall"
+        task :uninstall do
+          safe_unlink @dest
+        end
+
+        desc "distribute: diff"
+        task :diff do
+          diffy = Diffy::Diff.new(
+            @dest, @src, :source => 'files', :allow_empty_diff => true
+          ).to_s(:text)
+
+          @diff_proc.call(@dest, @src) unless diffy.empty?
         end
       end
 

data/lib/rake/distribute/task.rb

@@ -0,0 +1,13 @@
+module Rake
+
+  class Task
+    alias_method :_add_comment, :add_comment
+    # Add a comment to the task. Ignore duplicated comment
+    def add_comment(comment)
+      return if @full_comment.eql?(comment)
+      _add_comment(comment)
+    end
+
+  end # class Rake::Task
+end
+

data/lib/rake/distribute/version.rb

@@ -1,3 +1,3 @@
 module Rake::Distribute
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rake-distribute
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Zhao Cai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,18 +62,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
-description: ! 'Generate rake distribute:install, uninstall, and diff tasks to distribute
-  items (files, templates, directories, etc.) to difference locations.
+description: |-
+  Generate rake distribute:install, uninstall, and diff tasks to distribute items (files, templates, directories, etc.) to difference locations.
 
-
-  It is the saver to use rake tasks to manage 1 -> n file distribution. Commonly applied
-  cases are runcom files, Makefiles, etc. Those files exists in many locations and
-  are almost identical with slight difference.'
+  It is the saver to use rake tasks to manage 1 -> n file distribution. Commonly applied cases are runcom files, Makefiles, etc. Those files exists in many locations and are almost identical with slight difference.
 email:
 - caizhaoff@gmail.com
 executables: []
@@ -103,6 +91,7 @@ files:
 - lib/rake/distribute/item.rb
 - lib/rake/distribute/item/erbfile.rb
 - lib/rake/distribute/item/file.rb
+- lib/rake/distribute/task.rb
 - lib/rake/distribute/version.rb
 - rake-distribute.gemspec
 - test/minitest_helper.rb
@@ -110,6 +99,7 @@ files:
 - .gemtest
 homepage: https://github.com/zhaocai/rake-distribute
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -117,22 +107,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rake-distribute
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate rake distribute:install, uninstall, and diff tasks to distribute
   items (files, templates, directories, etc.) to difference locations
 test_files: