ore 0.7.0 → 0.7.1

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.7.1 / 2011-02-20
+
+* Added {Ore::Generator#generate_dir}.
+* Added {Ore::Generator#generate_file}.
+* Only chmod generated files, if they are supposed to be executable.
+
 ### 0.7.0 / 2011-02-19
 
 * Require ore-core ~> 0.1, >= 0.1.2.

data/README.md

@@ -55,7 +55,7 @@ the developer to keep all of the project information in a single YAML file.
 The `gemspec.yml` file used to build Ore:
 
     name: ore
-    version: 0.7.0
+    version: 0.7.1
     summary: Mine raw RubyGems from YAML.
     description:
       Ore is a simple RubyGem building solution. Ore handles the

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: ore
-version: 0.7.0
+version: 0.7.1
 summary: Mine raw RubyGems from YAML
 description:
   Ore is a simple RubyGem building solution. Ore handles the

data/lib/ore/generator.rb

@@ -153,6 +153,69 @@ module Ore
 
     argument :path, :required => true
 
+    #
+    # Generates an empty directory.
+    #
+    # @param [String] dest
+    #   The uninterpolated destination path.
+    #
+    # @return [String]
+    #   The destination path of the directory.
+    #
+    # @since 0.7.1
+    #
+    def generate_dir(dest)
+      return if @generated_dirs.include?(dest)
+
+      path = interpolate(dest)
+      empty_directory path
+
+      @generated_dirs << dest
+      return path
+    end
+
+    #
+    # Generates a file.
+    #
+    # @param [String] dest
+    #   The uninterpolated destination path.
+    #
+    # @param [String] file
+    #   The source file or template.
+    #
+    # @param [Hash] options
+    #   Additional options.
+    #
+    # @option options [Boolean] :template
+    #   Specifies that the file is a template, and should be rendered.
+    #
+    # @return [String]
+    #   The destination path of the file.
+    #
+    # @since 0.7.1
+    #
+    def generate_file(dest,file,options={})
+      return if @generated_files.include?(dest)
+
+      path = interpolate(dest)
+
+      if options[:template]
+        @current_template_dir = File.dirname(dest)
+        template file, path
+        @current_template_dir = nil
+      else
+        copy_file file, path
+      end
+
+      if File.executable?(file)
+        umask = File.stat(File.join(destination_root,path)).mode
+        chmod path, (umask | 0111)
+      end
+
+      @generated_files << dest
+      return path
+    end
+
     #
     # Enables a template, adding it to the generator.
     #
@@ -280,22 +343,18 @@ module Ore
           instance_variable_set("@#{name}",value)
         end
       end
+
+      @generated_dirs = Set[]
+      @generated_files = Set[]
     end
 
     #
     # Creates directories listed in the template directories.
     #
     def generate_directories!
-      generated = Set[]
-
       @templates.each do |template|
         template.each_directory do |dir|
-          unless generated.include?(dir)
-            path = interpolate(dir)
-            empty_directory path
-
-            generated << dir
-          end
+          generate_dir dir
         end
       end
     end
@@ -304,35 +363,17 @@ module Ore
     # Copies static files and renders templates in the template directories.
     #
     def generate_files!
-      generated = Set[]
-
       # iterate through the templates in reverse, so files in the templates
       # loaded last override the previously templates.
       @templates.reverse_each do |template|
         # copy in the static files first
         template.each_file(@markup) do |dest,file|
-          unless generated.include?(dest)
-            path = interpolate(dest)
-
-            copy_file file, path
-            chmod path, File.stat(file).mode
-
-            generated << dest
-          end
+          generate_file dest, file
         end
 
         # then render the templates
         template.each_template(@markup) do |dest,file|
-          unless generated.include?(dest)
-            path = interpolate(dest)
-            @current_template_dir = File.dirname(dest)
-
-            template file, path
-            chmod path, File.stat(file).mode
-
-            @current_template_dir = nil
-            generated << dest
-          end
+          generate_file dest, file, :template => true
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: ore
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Postmodern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 -08:00
+date: 2011-02-20 00:00:00 -08:00
 default_executable: ore
 dependencies: 
 - !ruby/object:Gem::Dependency