fluent_command_builder 0.1.18 → 0.1.19

data/lib/fluent_command_builder/command_base.rb

@@ -1,5 +1,10 @@
 class CommandBase
-  def execute
+
+  def initialize builder
+    @builder = builder
+  end
+
+  def execute!
     begin
       require 'rake'
       sh to_s
@@ -7,4 +12,9 @@ class CommandBase
       Kernel.system to_s
     end
   end
+
+  def to_s
+    @builder.to_s
+  end
+
 end

data/lib/fluent_command_builder/command_builder.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/command_base')
 module FluentCommandBuilder
   class CommandBuilder
 
-    def initialize command=nil
+    def initialize command_name, command=nil
+      @command_name = command_name
       @command = command.to_s
     end
 
@@ -34,6 +35,10 @@ module FluentCommandBuilder
     end
 
     def to_s
+      "#{@command_name} #{@command.strip}".strip
+    end
+
+    def args
       @command.strip
     end
 

data/lib/fluent_command_builder/command_builders/aspnet_compiler_20.rb

@@ -4,78 +4,95 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module AspnetCompiler
     module V20
+      COMMAND_NAME = 'aspnet_compiler'
       class AspnetCompiler < CommandBase
         def initialize builder, target_dir=nil
-          @builder = builder
-          @builder.append 'aspnet_compiler'
+          super builder
           @builder.append " #{@builder.format target_dir}" unless target_dir.nil?
         end
         def metabase_path metabase_path
           @builder.append " -m #{@builder.format metabase_path}"
+          yield @builder if block_given?
           self
         end
         def virtual_path virtual_path
           @builder.append " -v #{@builder.format virtual_path}"
+          yield @builder if block_given?
           self
         end
         def physical_path physical_path
           @builder.append " -p #{@builder.format physical_path}"
+          yield @builder if block_given?
           self
         end
         def allow_subsequent_updates 
           @builder.append ' -u'
+          yield @builder if block_given?
           self
         end
         def force_overwrite_files 
           @builder.append ' -f'
+          yield @builder if block_given?
           self
         end
         def force_debug_output 
           @builder.append ' -d'
+          yield @builder if block_given?
           self
         end
         def fixed_names 
           @builder.append ' -fixedNames'
+          yield @builder if block_given?
           self
         end
         def full_rebuild 
           @builder.append ' -c'
+          yield @builder if block_given?
           self
         end
         def error_stack 
           @builder.append ' -errorStack'
+          yield @builder if block_given?
           self
         end
         def no_logo 
           @builder.append ' -noLogo'
+          yield @builder if block_given?
           self
         end
         def key_file file
           @builder.append " -keyFile #{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def key_container container
           @builder.append " -keyContainer #{@builder.format container}"
+          yield @builder if block_given?
           self
         end
         def aptca 
           @builder.append ' -aptca'
+          yield @builder if block_given?
           self
         end
         def delay_sign 
           @builder.append ' -delaySign'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def aspnet_compiler target_dir=nil
-        AspnetCompiler.new CommandBuilder.new, target_dir
+        builder = CommandBuilder.new COMMAND_NAME
+        command = AspnetCompiler.new builder, target_dir
+        yield builder if block_given?
+        command
       end
     end
   end
   def aspnet_compiler_20 target_dir=nil
-    AspnetCompiler::V20::AspnetCompiler.new CommandBuilder.new, target_dir
+    builder = CommandBuilder.new AspnetCompiler::V20::COMMAND_NAME
+    command = AspnetCompiler::V20::AspnetCompiler.new builder, target_dir
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/aspnet_compiler_35.rb

@@ -4,78 +4,95 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module AspnetCompiler
     module V35
+      COMMAND_NAME = 'aspnet_compiler'
       class AspnetCompiler < CommandBase
         def initialize builder, target_dir=nil
-          @builder = builder
-          @builder.append 'aspnet_compiler'
+          super builder
           @builder.append " #{@builder.format target_dir}" unless target_dir.nil?
         end
         def metabase_path metabase_path
           @builder.append " -m #{@builder.format metabase_path}"
+          yield @builder if block_given?
           self
         end
         def virtual_path virtual_path
           @builder.append " -v #{@builder.format virtual_path}"
+          yield @builder if block_given?
           self
         end
         def physical_path physical_path
           @builder.append " -p #{@builder.format physical_path}"
+          yield @builder if block_given?
           self
         end
         def allow_subsequent_updates 
           @builder.append ' -u'
+          yield @builder if block_given?
           self
         end
         def force_overwrite_files 
           @builder.append ' -f'
+          yield @builder if block_given?
           self
         end
         def force_debug_output 
           @builder.append ' -d'
+          yield @builder if block_given?
           self
         end
         def fixed_names 
           @builder.append ' -fixedNames'
+          yield @builder if block_given?
           self
         end
         def full_rebuild 
           @builder.append ' -c'
+          yield @builder if block_given?
           self
         end
         def error_stack 
           @builder.append ' -errorStack'
+          yield @builder if block_given?
           self
         end
         def no_logo 
           @builder.append ' -noLogo'
+          yield @builder if block_given?
           self
         end
         def key_file file
           @builder.append " -keyFile #{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def key_container container
           @builder.append " -keyContainer #{@builder.format container}"
+          yield @builder if block_given?
           self
         end
         def aptca 
           @builder.append ' -aptca'
+          yield @builder if block_given?
           self
         end
         def delay_sign 
           @builder.append ' -delaySign'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def aspnet_compiler target_dir=nil
-        AspnetCompiler.new CommandBuilder.new, target_dir
+        builder = CommandBuilder.new COMMAND_NAME
+        command = AspnetCompiler.new builder, target_dir
+        yield builder if block_given?
+        command
       end
     end
   end
   def aspnet_compiler_35 target_dir=nil
-    AspnetCompiler::V35::AspnetCompiler.new CommandBuilder.new, target_dir
+    builder = CommandBuilder.new AspnetCompiler::V35::COMMAND_NAME
+    command = AspnetCompiler::V35::AspnetCompiler.new builder, target_dir
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/aspnet_compiler_40.rb

@@ -4,78 +4,95 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module AspnetCompiler
     module V40
+      COMMAND_NAME = 'aspnet_compiler'
       class AspnetCompiler < CommandBase
         def initialize builder, target_dir=nil
-          @builder = builder
-          @builder.append 'aspnet_compiler'
+          super builder
           @builder.append " #{@builder.format target_dir}" unless target_dir.nil?
         end
         def metabase_path metabase_path
           @builder.append " -m #{@builder.format metabase_path}"
+          yield @builder if block_given?
           self
         end
         def virtual_path virtual_path
           @builder.append " -v #{@builder.format virtual_path}"
+          yield @builder if block_given?
           self
         end
         def physical_path physical_path
           @builder.append " -p #{@builder.format physical_path}"
+          yield @builder if block_given?
           self
         end
         def allow_subsequent_updates 
           @builder.append ' -u'
+          yield @builder if block_given?
           self
         end
         def force_overwrite_files 
           @builder.append ' -f'
+          yield @builder if block_given?
           self
         end
         def force_debug_output 
           @builder.append ' -d'
+          yield @builder if block_given?
           self
         end
         def fixed_names 
           @builder.append ' -fixedNames'
+          yield @builder if block_given?
           self
         end
         def full_rebuild 
           @builder.append ' -c'
+          yield @builder if block_given?
           self
         end
         def error_stack 
           @builder.append ' -errorStack'
+          yield @builder if block_given?
           self
         end
         def no_logo 
           @builder.append ' -noLogo'
+          yield @builder if block_given?
           self
         end
         def key_file file
           @builder.append " -keyFile #{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def key_container container
           @builder.append " -keyContainer #{@builder.format container}"
+          yield @builder if block_given?
           self
         end
         def aptca 
           @builder.append ' -aptca'
+          yield @builder if block_given?
           self
         end
         def delay_sign 
           @builder.append ' -delaySign'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def aspnet_compiler target_dir=nil
-        AspnetCompiler.new CommandBuilder.new, target_dir
+        builder = CommandBuilder.new COMMAND_NAME
+        command = AspnetCompiler.new builder, target_dir
+        yield builder if block_given?
+        command
       end
     end
   end
   def aspnet_compiler_40 target_dir=nil
-    AspnetCompiler::V40::AspnetCompiler.new CommandBuilder.new, target_dir
+    builder = CommandBuilder.new AspnetCompiler::V40::COMMAND_NAME
+    command = AspnetCompiler::V40::AspnetCompiler.new builder, target_dir
+    yield builder if block_given?
+    command
   end
 end

data/lib/fluent_command_builder/command_builders/bundle_11.rb

@@ -4,10 +4,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../command_builder')
 module FluentCommandBuilder
   module Bundle
     module V11
+      COMMAND_NAME = 'bundle'
       class Bundle < CommandBase
         def initialize builder
-          @builder = builder
-          @builder.append 'bundle'
+          super builder
         end
         def cache 
           Cache.new @builder
@@ -21,15 +21,18 @@ module FluentCommandBuilder
         def config name, value=nil
           @builder.append " config #{@builder.format name}"
           @builder.append " #{@builder.format value}" unless value.nil?
+          yield @builder if block_given?
           self
         end
         def console group=nil
           @builder.append ' console'
           @builder.append " #{@builder.format group}" unless group.nil?
+          yield @builder if block_given?
           self
         end
         def exec command
           @builder.append " exec #{@builder.format command}"
+          yield @builder if block_given?
           self
         end
         def gem gem
@@ -43,6 +46,7 @@ module FluentCommandBuilder
         end
         def open gem
           @builder.append " open #{@builder.format gem}"
+          yield @builder if block_given?
           self
         end
         def outdated gem=nil
@@ -59,251 +63,254 @@ module FluentCommandBuilder
         end
         def version 
           @builder.append ' version'
+          yield @builder if block_given?
           self
         end
         def viz 
           Viz.new @builder
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Cache < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' cache'
         end
         def no_prune 
           @builder.append ' --no-prune'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Check < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' check'
         end
         def gemfile file
           @builder.append " --gemfile=#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def path path
           @builder.append " --path=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Clean < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' clean'
         end
         def force 
           @builder.append ' --force'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Gem < CommandBase
         def initialize builder, gem
-          @builder = builder
+          super builder
           @builder.append " gem #{@builder.format gem}"
         end
         def bin 
           @builder.append ' --bin'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Init < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' init'
         end
         def gemspec file
           @builder.append " --gemspec=#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Install < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' install'
         end
         def binstubs path
           @builder.append " --binstubs=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
         def clean 
           @builder.append ' --clean'
+          yield @builder if block_given?
           self
         end
         def deployment 
           @builder.append ' --deployment'
+          yield @builder if block_given?
           self
         end
         def frozen 
           @builder.append ' --frozen'
+          yield @builder if block_given?
           self
         end
         def full_index 
           @builder.append ' --full-index'
+          yield @builder if block_given?
           self
         end
         def gemfile file
           @builder.append " --gemfile=#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def local 
           @builder.append ' --local'
+          yield @builder if block_given?
           self
         end
         def no_cache 
           @builder.append ' --no-cache'
+          yield @builder if block_given?
           self
         end
         def no_prune 
           @builder.append ' --no-prune'
+          yield @builder if block_given?
           self
         end
         def path path
           @builder.append " --path=#{@builder.format path}"
+          yield @builder if block_given?
           self
         end
         def quiet 
           @builder.append ' --quiet'
+          yield @builder if block_given?
           self
         end
         def shebang string
           @builder.append " --shebang=#{@builder.format string}"
+          yield @builder if block_given?
           self
         end
         def standalone array
           @builder.append " --standalone=#{@builder.format array}"
+          yield @builder if block_given?
           self
         end
         def system 
           @builder.append ' --system'
+          yield @builder if block_given?
           self
         end
         def without group
           @builder.append " --without=#{@builder.format group}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Outdated < CommandBase
         def initialize builder, gem=nil
-          @builder = builder
+          super builder
           @builder.append ' outdated'
           @builder.append " #{@builder.format gem}" unless gem.nil?
         end
         def local 
           @builder.append ' --local'
+          yield @builder if block_given?
           self
         end
         def pre 
           @builder.append ' --pre'
+          yield @builder if block_given?
           self
         end
         def source 
           @builder.append ' --source'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Package < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' package'
         end
         def no_prune 
           @builder.append ' --no-prune'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Show < CommandBase
         def initialize builder, gem=nil
-          @builder = builder
+          super builder
           @builder.append ' show'
           @builder.append " #{@builder.format gem}" unless gem.nil?
         end
         def paths 
           @builder.append ' --paths'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Update < CommandBase
         def initialize builder, gem=nil
-          @builder = builder
+          super builder
           @builder.append ' update'
           @builder.append " #{@builder.format gem}" unless gem.nil?
         end
         def local 
           @builder.append ' --local'
+          yield @builder if block_given?
           self
         end
         def source source
           @builder.append " --source=#{@builder.format source}"
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       class Viz < CommandBase
         def initialize builder
-          @builder = builder
+          super builder
           @builder.append ' viz'
         end
         def file file
           @builder.append " --file=#{@builder.format file}"
+          yield @builder if block_given?
           self
         end
         def format format
           @builder.append " --format=#{@builder.format format}"
+          yield @builder if block_given?
           self
         end
         def requirements 
           @builder.append ' --requirements'
+          yield @builder if block_given?
           self
         end
         def version 
           @builder.append ' --version'
+          yield @builder if block_given?
           self
         end
-        def to_s 
-          @builder.to_s
-        end
       end
       def bundle 
-        Bundle.new CommandBuilder.new
+        builder = CommandBuilder.new COMMAND_NAME
+        command = Bundle.new builder
+        yield builder if block_given?
+        command
       end
     end
   end
   def bundle_11 
-    Bundle::V11::Bundle.new CommandBuilder.new
+    builder = CommandBuilder.new Bundle::V11::COMMAND_NAME
+    command = Bundle::V11::Bundle.new builder
+    yield builder if block_given?
+    command
   end
 end