groundwork 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/groundwork

@@ -3,13 +3,20 @@
 require File.join(File.dirname(__FILE__),"..","lib","groundwork.rb")
 
 begin
-  options = Groundwork::parse_options
+    options = Groundwork::parse_options
 
-  raise RuntimeError.new("No command given; use \"groundwork -h\" for help") unless options[:command]
+    raise RuntimeError.new("No command given; use \"groundwork -h\" for help") unless options[:command]
 
-  load File.join(File.dirname(__FILE__),"..","commands",options[:command]+".rb")
+    command_file = File.join(File.dirname(__FILE__),"..","commands",options[:command]+".rb")
 
-  Groundwork::Commands.send options[:command], options[:remainder]
+    if File.exists? command_file
+        load command_file
+        Groundwork::Commands.send options[:command], options[:remainder]
+    elsif Groundwork.known_recipes[options[:command]]
+        Groundwork::Recipe.run Groundwork.known_recipes[options[:command]]
+    else
+        raise RuntimeError.new("#{options[:command]} is neither a command nor a recipe name; use \"groundwork -h\" for help")
+    end
 rescue
-  puts $!.to_s
+    puts $!.to_s
 end

data/lib/recipe.rb

@@ -1,65 +1,81 @@
 module Groundwork
-  class Recipe
-    def initialize &block
-      if block_given?
-        instance_eval &block
-      end
-    end
+    class Recipe
+        def initialize args=[], &block
+            @args = args
+            @name = args[0]
+            if block_given?
+                instance_eval &block
+            end
+        end
 
-    def tar= data
-      @tar = TarWrapper.new(data)
-    end
+        def tar= data
+            @tar = TarWrapper.new(data)
+        end
 
-    # Creates a directory. If a block is passed,
-    # the block will be run inside that directory
-    def directory *name, &block
-      FileUtils.mkdir_p File.join(name)
-      if block_given?
-        FileUtils.cd File.join(name), &block
-      end
-    end
+        def options &block
+            opts = Trollop::options(@args) do
+                self.instance_eval &block
+            end
+
+            opts.each do |name, val|
+                instance_variable_set "@#{name}", val
+            end
+
+            @name = @args[0]
 
-    # If opts is a string, it's the contents of the file, verbatim
-    # If opts is a hash, it must contain either:
-    # * :from, copies the text of the given filename verbatim
-    # * :from_erb, uses the text of the filename as an erb template
-    # * :erb, uses the given string as an erb template
-    def file name, opts = nil
-      name = File.join(name)
-      File.open(File.join(name),"w") do |file|
-        if opts.is_a? String
-          file.print opts
-        elsif opts.is_a? Hash
-          file.print( if opts[:from]
-                        read_file opts[:from]
-                      elsif opts[:from_erb]
-                        ERB.new(read_file(opts[:from_erb])).result(binding)
-                      elsif opts[:erb]
-                        ERB.new(opts[:erb]).result(binding)
-                      end )
-        elsif opts.nil?
-          # write nothing
-        else
-          raise ArgumentError.new
+            opts
+        end
+
+        # Creates a directory. If a block is passed,
+        # the block will be run inside that directory
+        def directory *name, &block
+            FileUtils.mkdir_p File.join(name)
+            if block_given?
+                FileUtils.cd File.join(name), &block
+            end
         end
-      end
-    end
 
-    # When you compile a recipe, it runs it to determine which files to bake in.
-    # If you have a file that might not be generated by running your script with
-    # no options, you can call possible on it to ensure it gets baked into
-    # the script. This function only has an effect during compilation, it does
-    # nothing when the script is actually run.
-    def possible name ; end
+        # If opts is a string, it's the contents of the file, verbatim
+        # If opts is a hash, it must contain either:
+        # * :from, copies the text of the given filename verbatim
+        # * :from_erb, uses the text of the filename as an erb template
+        # * :erb, uses the given string as an erb template
+        def file name, opts = nil
+            name = File.join(name)
+            File.open(File.join(name),"w") do |file|
+                if opts.is_a? String
+                    file.print opts
+                elsif opts.is_a? Hash
+                    file.print( if opts[:from]
+                                    read_file opts[:from]
+                                elsif opts[:from_erb]
+                                    ERB.new(read_file(opts[:from_erb])).result(binding)
+                                elsif opts[:erb]
+                                    ERB.new(opts[:erb]).result(binding)
+                                end )
+                elsif opts.nil?
+                    # write nothing
+                else
+                    raise ArgumentError.new
+                end
+            end
+        end
+
+        # When you compile a recipe, it runs it to determine which files to bake in.
+        # If you have a file that might not be generated by running your script with
+        # no options, you can call possible on it to ensure it gets baked into
+        # the script. This function only has an effect during compilation, it does
+        # nothing when the script is actually run.
+        def possible name ; end
 
-    private
+        private
 
-    def read_file name
-      if @tar
-        @tar[name]
-      else
-        File.read(name)
-      end
+        def read_file name
+            if @tar
+                @tar[name]
+            else
+                File.read(name)
+            end
+        end
     end
-  end
 end

data/lib/recipe_class.rb

@@ -66,7 +66,7 @@ module Groundwork
         (script, data) = File.read(script_file).split("\n__END__\n")
 
         Groundwork::Recipe.new do
-          self.tar = data
+          self.tar = data if data
           eval script
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Andrews, Ross