fluent_command_builder 0.9.1 → 0.9.2

data/lib/fluent_command_builder/command_builders/nuget_21.rb

@@ -0,0 +1,533 @@
+# Generated code. Do not modify.
+
+require File.expand_path(File.dirname(__FILE__) + '/../internal/command_base')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/command_builder_config')
+require File.expand_path(File.dirname(__FILE__) + '/../internal/underlying_builder')
+
+module FluentCommandBuilder
+  module NuGet
+    module V21
+      VERSION = '2.1'
+      @@config = CommandBuilderConfig.new FluentCommandBuilder::NuGet::COMMAND_NAME, VERSION
+      @@config.version_detector = FluentCommandBuilder::NuGet.version_detector
+      def configure_nuget
+        yield @@config
+        @@config.validate_path
+        @@config.validate_version
+      end
+      def nuget
+        b = UnderlyingBuilder.new @@config
+        c = NuGet.new(b)
+        yield b if block_given?
+        c
+      end
+      class NuGet < CommandBase
+        def initialize(underlying_builder)
+          super underlying_builder
+        end
+        def config
+          Config.new @b
+        end
+        def delete(package_id, package_version)
+          Delete.new @b, package_id, package_version
+        end
+        def help(command=nil)
+          Help.new @b, command
+        end
+        def install(package_id_or_path_to_packages_config)
+          Install.new @b, package_id_or_path_to_packages_config
+        end
+        def list(search_terms=nil)
+          List.new @b, search_terms
+        end
+        def pack(nuspec_or_project)
+          Pack.new @b, nuspec_or_project
+        end
+        def push(package_path)
+          Push.new @b, package_path
+        end
+        def set_api_key(api_key)
+          SetApiKey.new @b, api_key
+        end
+        def sources(action)
+          Sources.new @b, action
+        end
+        def spec(package_id)
+          Spec.new @b, package_id
+        end
+        def update(packages_config_or_solution)
+          Update.new @b, packages_config_or_solution
+        end
+      end
+      class Config < CommandBase
+        def initialize(underlying_builder)
+          super underlying_builder
+          @b.append ' config'
+        end
+        def set(name, value)
+          @b.append " -Set #{@b.format name}=#{@b.format value}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Delete < CommandBase
+        def initialize(underlying_builder, package_id, package_version)
+          super underlying_builder
+          @b.append " delete #{@b.format package_id} #{@b.format package_version}"
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def no_prompt
+          @b.append ' -NoPrompt'
+          yield @b if block_given?
+          self
+        end
+        def api_key(api_key)
+          @b.append " -ApiKey #{@b.format api_key}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Help < CommandBase
+        def initialize(underlying_builder, command=nil)
+          super underlying_builder
+          @b.append ' help'
+          @b.append " #{@b.format command}" unless command.nil?
+        end
+        def all
+          @b.append ' -All'
+          yield @b if block_given?
+          self
+        end
+        def markdown
+          @b.append ' -Markdown'
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Install < CommandBase
+        def initialize(underlying_builder, package_id_or_path_to_packages_config)
+          super underlying_builder
+          @b.append " install #{@b.format package_id_or_path_to_packages_config}"
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def output_directory(output_directory)
+          @b.append " -OutputDirectory #{@b.format output_directory}"
+          yield @b if block_given?
+          self
+        end
+        def version(version)
+          @b.append " -Version #{@b.format version}"
+          yield @b if block_given?
+          self
+        end
+        def exclude_version
+          @b.append ' -ExcludeVersion'
+          yield @b if block_given?
+          self
+        end
+        def prerelease
+          @b.append ' -Prerelease'
+          yield @b if block_given?
+          self
+        end
+        def no_cache
+          @b.append ' -NoCache'
+          yield @b if block_given?
+          self
+        end
+        def require_consent
+          @b.append ' -RequireConsent'
+          yield @b if block_given?
+          self
+        end
+        def solution_directory(solution_directory)
+          @b.append " -SolutionDirectory #{@b.format solution_directory}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class List < CommandBase
+        def initialize(underlying_builder, search_terms=nil)
+          super underlying_builder
+          @b.append ' list'
+          @b.append " #{@b.format search_terms}" unless search_terms.nil?
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def verbose
+          @b.append ' -Verbose'
+          yield @b if block_given?
+          self
+        end
+        def all_versions
+          @b.append ' -AllVersions'
+          yield @b if block_given?
+          self
+        end
+        def prerelease
+          @b.append ' -Prerelease'
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Pack < CommandBase
+        def initialize(underlying_builder, nuspec_or_project)
+          super underlying_builder
+          @b.append " pack #{@b.format nuspec_or_project}"
+        end
+        def output_directory(output_directory)
+          @b.append " -OutputDirectory #{@b.format output_directory}"
+          yield @b if block_given?
+          self
+        end
+        def base_path(base_path)
+          @b.append " -BasePath #{@b.format base_path}"
+          yield @b if block_given?
+          self
+        end
+        def verbose
+          @b.append ' -Verbose'
+          yield @b if block_given?
+          self
+        end
+        def version(version)
+          @b.append " -Version #{@b.format version}"
+          yield @b if block_given?
+          self
+        end
+        def exclude(pattern)
+          @b.append " -Exclude #{@b.format pattern}"
+          yield @b if block_given?
+          self
+        end
+        def symbols
+          @b.append ' -Symbols'
+          yield @b if block_given?
+          self
+        end
+        def tool
+          @b.append ' -Tool'
+          yield @b if block_given?
+          self
+        end
+        def build
+          @b.append ' -Build'
+          yield @b if block_given?
+          self
+        end
+        def no_default_excludes
+          @b.append ' -NoDefaultExcludes'
+          yield @b if block_given?
+          self
+        end
+        def no_package_analysis
+          @b.append ' -NoPackageAnalysis'
+          yield @b if block_given?
+          self
+        end
+        def exclude_empty_directories
+          @b.append ' -ExcludeEmptyDirectories'
+          yield @b if block_given?
+          self
+        end
+        def properties(properties)
+          @b.append " -Properties #{@b.format properties, ';'}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Push < CommandBase
+        def initialize(underlying_builder, package_path)
+          super underlying_builder
+          @b.append " push #{@b.format package_path}"
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def api_key(api_key)
+          @b.append " -ApiKey #{@b.format api_key}"
+          yield @b if block_given?
+          self
+        end
+        def timeout(seconds)
+          @b.append " -Timeout #{@b.format seconds}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class SetApiKey < CommandBase
+        def initialize(underlying_builder, api_key)
+          super underlying_builder
+          @b.append " setApiKey #{@b.format api_key}"
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Sources < CommandBase
+        def initialize(underlying_builder, action)
+          super underlying_builder
+          @b.append " sources #{@b.format action}"
+        end
+        def name(name)
+          @b.append " -Name #{@b.format name}"
+          yield @b if block_given?
+          self
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def user_name(user_name)
+          @b.append " -UserName #{@b.format user_name}"
+          yield @b if block_given?
+          self
+        end
+        def password(password)
+          @b.append " -Password #{@b.format_password password}"
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Spec < CommandBase
+        def initialize(underlying_builder, package_id)
+          super underlying_builder
+          @b.append " spec #{@b.format package_id}"
+        end
+        def assembly_path(assembly_path)
+          @b.append " -AssemblyPath #{@b.format assembly_path}"
+          yield @b if block_given?
+          self
+        end
+        def force
+          @b.append ' -Force'
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+      class Update < CommandBase
+        def initialize(underlying_builder, packages_config_or_solution)
+          super underlying_builder
+          @b.append " update #{@b.format packages_config_or_solution}"
+        end
+        def source(source)
+          @b.append " -Source #{@b.format source}"
+          yield @b if block_given?
+          self
+        end
+        def id(package_id)
+          @b.append " -Id #{@b.format package_id}"
+          yield @b if block_given?
+          self
+        end
+        def repository_path(repository_path)
+          @b.append " -RepositoryPath #{@b.format repository_path}"
+          yield @b if block_given?
+          self
+        end
+        def safe
+          @b.append ' -Safe'
+          yield @b if block_given?
+          self
+        end
+        def self
+          @b.append ' -Self'
+          yield @b if block_given?
+          self
+        end
+        def verbose
+          @b.append ' -Verbose'
+          yield @b if block_given?
+          self
+        end
+        def prerelease
+          @b.append ' -Prerelease'
+          yield @b if block_given?
+          self
+        end
+        def help
+          @b.append ' -Help'
+          yield @b if block_given?
+          self
+        end
+        def verbosity(verbosity)
+          @b.append " -Verbosity #{@b.format verbosity}"
+          yield @b if block_given?
+          self
+        end
+        def non_interactive
+          @b.append ' -NonInteractive'
+          yield @b if block_given?
+          self
+        end
+      end
+
+    end
+  end
+end

data/lib/fluent_command_builder/internal/command_builder_config.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../version_validator')
 require File.expand_path(File.dirname(__FILE__) + '/../version_detectors/default_version_detector')
+require File.expand_path(File.dirname(__FILE__) + '/path')
 require File.expand_path(File.dirname(__FILE__) + '/path_validator')
 
 module FluentCommandBuilder
@@ -29,30 +30,13 @@ module FluentCommandBuilder
     def validate_version
       return unless @version
       v = @version_validator || VersionValidator.new(@command_name, @version_detector)
-      v.validate @version, evaluated_path
+      p = Path.new @path
+      v.validate @version, p.evaluated_path
     end
 
     def executable
-      e = @path ? File.join(@path, @command_name) : @command_name
-      normalise_path e
-    end
-
-    def evaluated_executable
-      evaluate_path executable
-    end
-
-    def evaluated_path
-      evaluate_path @path if @path
-    end
-
-    private
-
-    def evaluate_path(path)
-      `echo #{normalise_path path}`.strip
-    end
-
-    def normalise_path(path)
-      @is_windows ? path.gsub('/', '\\') : path.gsub('\\', '/')
+      p = Path.new @path.to_s, @command_name
+      p.normalised_path
     end
 
   end

data/lib/fluent_command_builder/internal/path.rb

@@ -0,0 +1,27 @@
+module FluentCommandBuilder
+  class Path
+
+    attr_accessor :path, :is_windows
+
+    def initialize(*path)
+      path.select! { |p| p unless p == '' }
+      @path = File.join path
+      @is_windows = !ENV['WINDIR'].nil?
+    end
+
+    def evaluated_path
+      return unless @path
+      `echo #{normalised_path}`.strip
+    end
+
+    def normalised_path
+      return unless @path
+      @is_windows ? @path.gsub('/', '\\') : @path.gsub('\\', '/')
+    end
+
+    def to_s
+      evaluated_path
+    end
+
+  end
+end

data/lib/fluent_command_builder/internal/path_validator.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/path')
 require File.expand_path(File.dirname(__FILE__) + '/printer')
 
 module FluentCommandBuilder
@@ -17,9 +18,10 @@ module FluentCommandBuilder
       return if validation_level == :off
 
       if @c.path
-        path = @c.evaluated_path
-        return if File.exist? path
-        message = %Q[Path for command "#{@c.command_name}", version "#{@c.version}" does not exist. Path: #{path}]
+        p = Path.new @c.path
+        evaluated_path = p.evaluated_path
+        return if File.exist? evaluated_path
+        message = %Q[Path for command "#{@c.command_name}", version "#{@c.version}" does not exist. Path: #{evaluated_path}]
       else
         return if @path_finder.find_path @c.command_name
         message = %Q[Command "#{@c.command_name}" was not found on the PATH.]

data/lib/fluent_command_builder/internal/underlying_builder.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/argument_formatter')
+require File.expand_path(File.dirname(__FILE__) + '/path')
 require File.expand_path(File.dirname(__FILE__) + '/../execution_context')
 
 module FluentCommandBuilder
@@ -33,7 +34,8 @@ module FluentCommandBuilder
     end
 
     def to_s
-      "#{quote_if_includes_space @c.evaluated_executable} #{@args}".strip
+      p = Path.new @c.executable
+      "#{quote_if_includes_space p.evaluated_path} #{@args}".strip
     end
 
     private

data/lib/fluent_command_builder/version_detectors/standard_version_detector.rb

@@ -1,3 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/../internal/path')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/path_finder')
 require File.expand_path(File.dirname(__FILE__) + '/../internal/version')
 require File.expand_path(File.dirname(__FILE__) + '/../command_executors/backticks_executor')
@@ -17,12 +18,12 @@ module FluentCommandBuilder
     def version(path=nil)
       path ||= @path_finder.find_path @command_name
       return unless path && File.exist?(path)
-      Dir.chdir path do
-        command = %Q["#{@command_name}" #{@command_arg} 2>&1]
-        output = @backticks_executor.execute command
-        v = Version.match(output)
-        v ? v.version : nil
-      end
+      path = nil if path == '.'
+      executable = path ? Path.new(path, @command_name).evaluated_path : @command_name
+      command = %Q["#{executable}" #{@command_arg} 2>&1]
+      output = @backticks_executor.execute(command).to_s
+      v = Version.match(output)
+      v ? v.version : nil
     end
 
   end

data/lib/fluent_command_builder/version_validator.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/internal/printer')
+require File.expand_path(File.dirname(__FILE__) + '/internal/path')
 
 module FluentCommandBuilder
   class VersionValidator
@@ -17,8 +18,9 @@ module FluentCommandBuilder
       validate_validation_level
       return if @validation_level == :off
 
+      p = Path.new path
       @expected_version_string = expected_version_string
-      @actual_version_string = @version_detector.version path
+      @actual_version_string = @version_detector.version p.evaluated_path
 
       unless actual_version
         @printer.print_warning error_message('unable to determine actual version')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_command_builder
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70183412696920 !ruby/object:Gem::Requirement
+  requirement: &70282337803860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183412696920
+  version_requirements: *70282337803860
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70183412696480 !ruby/object:Gem::Requirement
+  requirement: &70282337803420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70183412696480
+  version_requirements: *70282337803420
 description: Fluent Command Builder makes building command lines easy and clean.
 email: matthew-github@matthewriley.name
 executables: []
@@ -82,6 +82,7 @@ files:
 - lib/fluent_command_builder/command_builders/netsh_61.rb
 - lib/fluent_command_builder/command_builders/nuget.rb
 - lib/fluent_command_builder/command_builders/nuget_20.rb
+- lib/fluent_command_builder/command_builders/nuget_21.rb
 - lib/fluent_command_builder/command_builders/nunit.rb
 - lib/fluent_command_builder/command_builders/nunit_25.rb
 - lib/fluent_command_builder/command_builders/nunit_26.rb
@@ -112,6 +113,7 @@ files:
 - lib/fluent_command_builder/internal/argument_formatter.rb
 - lib/fluent_command_builder/internal/command_base.rb
 - lib/fluent_command_builder/internal/command_builder_config.rb
+- lib/fluent_command_builder/internal/path.rb
 - lib/fluent_command_builder/internal/path_finder.rb
 - lib/fluent_command_builder/internal/path_finders/unix_path_finder.rb
 - lib/fluent_command_builder/internal/path_finders/windows_path_finder.rb