hammer_cli 0.1.0 → 0.1.1

data/test/unit/option_builder_test.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+require 'tempfile'
+
+
+describe HammerCLI::OptionBuilderContainer do
+
+  let(:options) {
+    [
+      HammerCLI::Options::OptionDefinition.new(["--test"], "TEST", "test"),
+      HammerCLI::Options::OptionDefinition.new(["--test2"], "TEST2", "test2")
+    ]
+  }
+  let(:container) { HammerCLI::OptionBuilderContainer.new }
+
+  it "collects options from contained builders" do
+    builder = Object.new
+    builder.stubs(:build).returns(options)
+
+    container.builders = [builder, builder]
+    container.build.must_equal options+options
+  end
+
+  it "passes build parameters from contained builders" do
+    params = {:param => :value}
+    builder = Object.new
+    builder.expects(:build).with(params).returns(options)
+
+    container.builders = [builder]
+    container.build(params)
+  end
+
+end
+

data/test/unit/output/adapter/abstract_test.rb

@@ -11,7 +11,7 @@ describe HammerCLI::Output::Adapter::Abstract do
   end
 
   class UnknownTestFormatter < HammerCLI::Output::Formatters::FieldFormatter
-    def format(data)
+    def format(data, field_params={})
       data+'.'
     end
 
@@ -52,7 +52,7 @@ describe HammerCLI::Output::Adapter::Abstract do
     end
 
     it "should print formatted message with parameters" do
-      proc { adapter.print_message("MESSAGE %{a}s, %{b}s", :a => 'A', :b => 'B') }.must_output(/.*MESSAGE A, B.*/, "")
+      proc { adapter.print_message("MESSAGE %{a}, %{b}", :a => 'A', :b => 'B') }.must_output(/.*MESSAGE A, B.*/, "")
     end
 
   end
@@ -87,10 +87,33 @@ describe HammerCLI::Output::Adapter::Abstract do
 
     it "should print formatted message with parameters" do
       proc {
-        adapter.print_error("MESSAGE %{a}s, %{b}s", ["error %{a}s", "error %{b}s"], :a => 'A', :b => 'B')
+        adapter.print_error("MESSAGE %{a}, %{b}", ["error %{a}", "error %{b}"], :a => 'A', :b => 'B')
       }.must_output("", expected_formatted_output)
     end
 
   end
 
+  context "test data_for_field" do
+    let(:field) { Fields::Field.new(:path => [:field1]) }
+
+    it "returns nil if the record is nil" do
+      record = nil
+      assert_nil adapter.send(:data_for_field, field, record)
+    end
+
+    it "returns nil if the record is not a hash" do
+      record = []
+      assert_nil adapter.send(:data_for_field, field, record)
+    end
+
+    it "returns nil, if the data does not exist for the field" do
+      record = { :field2 => :value2 }
+      assert_nil adapter.send(:data_for_field, field, record)
+    end
+
+    it "returns the value, if data exists for the field" do
+      record = { :field1 => :value1, :field2 => :value2 }
+      assert_equal adapter.send(:data_for_field, field, record), :value1
+    end
+  end
 end

data/test/unit/output/adapter/base_test.rb

@@ -14,7 +14,8 @@ describe HammerCLI::Output::Adapter::Base do
     let(:address_city)  { Fields::Field.new(:path => [:address, :city], :label => "City") }
     let(:city)          { Fields::Field.new(:path => [:city], :label => "City") }
     let(:label_address) { Fields::Label.new(:path => [:address], :label => "Address") }
-    let(:contacts)      { Fields::Collection.new(:path => [:contacts], :label => "Contacts") }
+    let(:num_contacts)  { Fields::Collection.new(:path => [:contacts], :label => "Contacts") }
+    let(:contacts)      { Fields::Collection.new(:path => [:contacts], :label => "Contacts", :numbered => false) }
     let(:desc)          { Fields::Field.new(:path => [:desc], :label => "Description") }
     let(:contact)       { Fields::Field.new(:path => [:contact], :label => "Contact") }
     let(:params)        { Fields::KeyValueList.new(:path => [:params], :label => "Parameters") }
@@ -108,8 +109,8 @@ describe HammerCLI::Output::Adapter::Base do
 
 
     it "should print collection" do
-      contacts.output_definition.append [desc, contact]
-      fields = [contacts]
+      num_contacts.output_definition.append [desc, contact]
+      fields = [num_contacts]
 
       expected_output = [
         "Contacts: ",
@@ -123,6 +124,22 @@ describe HammerCLI::Output::Adapter::Base do
       proc { adapter.print_collection(fields, data) }.must_output(expected_output)
     end
 
+    it "should print unnumbered collection" do
+      contacts.output_definition.append [desc, contact]
+      fields = [contacts]
+
+      expected_output = [
+        "Contacts: ",
+        "    Description: personal email",
+        "    Contact:     john.doe@doughnut.com",
+        "    Description: telephone",
+        "    Contact:     123456789",
+        "\n"
+      ].join("\n")
+
+      proc { adapter.print_collection(fields, data) }.must_output(expected_output)
+    end
+
     it "hides ids by default" do
       fields = [id, name]
       expected_output = [

data/test/unit/output/adapter/csv_test.rb

@@ -47,7 +47,7 @@ describe HammerCLI::Output::Adapter::CSValues do
     context "formatters" do
       it "should apply formatters" do
         class DotFormatter < HammerCLI::Output::Formatters::FieldFormatter
-          def format(data)
+          def format(data, field_params={})
             '-DOT-'
           end
         end
@@ -59,7 +59,7 @@ describe HammerCLI::Output::Adapter::CSValues do
 
       it "should not replace nil with empty string before it applies formatters" do
         class NilFormatter < HammerCLI::Output::Formatters::FieldFormatter
-          def format(data)
+          def format(data, field_params={})
             'NIL' if data.nil?
           end
         end

data/test/unit/output/adapter/table_test.rb

@@ -9,6 +9,7 @@ describe HammerCLI::Output::Adapter::Table do
     let(:field_name) { Fields::Field.new(:path => [:fullname], :label => "Name") }
     let(:field_firstname) { Fields::Field.new(:path => [:firstname], :label => "Firstname") }
     let(:field_lastname) { Fields::Field.new(:path => [:lastname], :label => "Lastname") }
+    let(:field_long) { Fields::Field.new(:path => [:long], :label => "Full") }
 
     let(:fields) {
       [field_name]
@@ -119,7 +120,7 @@ describe HammerCLI::Output::Adapter::Table do
     context "formatters" do
       it "should apply formatters" do
         class DotFormatter < HammerCLI::Output::Formatters::FieldFormatter
-          def format(data)
+          def format(data, field_params={})
             '-DOT-'
           end
         end
@@ -128,6 +129,28 @@ describe HammerCLI::Output::Adapter::Table do
         out, err = capture_io { adapter.print_collection(fields, data) }
         out.must_match(/.*-DOT-.*/)
       end
+
+      it "should not break formatting" do
+        class SliceFormatter < HammerCLI::Output::Formatters::FieldFormatter
+          def format(data, field_params={})
+            data[0..5]
+          end
+        end
+
+        adapter = HammerCLI::Output::Adapter::Table.new({}, { :Field => [ SliceFormatter.new ]})
+
+        expected_output = [
+          "------",
+          "FULL  ",
+          "------",
+          "SomeVe",
+          "------",
+          ""
+        ].join("\n")
+
+        proc { adapter.print_collection([field_long], data) }.must_output(expected_output)
+      end
+
     end
 
     context "sort_columns" do

data/test/unit/output/definition_test.rb

@@ -8,6 +8,19 @@ describe HammerCLI::Output::Definition do
   let(:last_field) { definition.fields[-1] }
   let(:field_count) { definition.fields.length }
 
+  describe "empty?" do
+
+    it "returns true for empty definition" do
+      definition.empty?.must_equal true
+    end
+
+    it "returns false for definition with fields" do
+      definition.fields << Fields::Field.new
+      definition.empty?.must_equal false
+    end
+
+  end
+
   it "should be able to add field" do
     definition.fields << Fields::Field.new
     field_count.must_equal 1

data/test/unit/output/formatters_test.rb

@@ -34,7 +34,7 @@ end
 describe HammerCLI::Output::Formatters::FormatterContainer do
 
   class TestFormatter
-    def format(data)
+    def format(data, field_params={})
       data+'.'
     end
   end
@@ -138,3 +138,19 @@ describe HammerCLI::Output::Formatters::LongTextFormatter do
   end
 
 end
+
+describe HammerCLI::Output::Formatters::BooleanFormatter do
+
+  it "says yes for true like objects" do
+    formatter = HammerCLI::Output::Formatters::BooleanFormatter.new
+    formatter.format(true).must_equal "yes"
+    formatter.format("yes").must_equal "yes"
+  end
+
+  it "says no for false and nil and empty string" do
+    formatter = HammerCLI::Output::Formatters::BooleanFormatter.new
+    formatter.format(nil).must_equal "no"
+    formatter.format(false).must_equal "no"
+    formatter.format("").must_equal "no"
+  end
+end

data/test/unit/utils_test.rb

@@ -6,7 +6,7 @@ describe String do
   context "formatting" do
 
     let(:str) { "AA%<a>s BB%<b>s" }
-    let(:curly_str) { "AA%{a}s BB%{b}s" }
+    let(:curly_str) { "AA%{a} BB%{b}" }
     let(:pos_str) { "AA%s BB%s" }
 
     it "should not fail without expected parameters" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
 description: |
   Hammer cli provides universal extendable CLI interface for ruby apps
 email: mbacovsk@redhat.com
@@ -186,107 +186,119 @@ executables:
 - hammer
 extensions: []
 extra_rdoc_files:
-- doc/creating_apipie_commands.md
+- doc/option_builders.md
+- doc/design.uml
+- doc/writing_a_plugin.md
+- doc/installation_gem.md
+- doc/option_normalizers.md
 - doc/development_tips.md
+- doc/i18n.md
+- doc/creating_apipie_commands.md
 - doc/developer_docs.md
+- doc/design.png
 - doc/creating_commands.md
-- doc/option_normalizers.md
+- doc/installation_source.md
+- doc/installation_rpm.md
 - doc/installation.md
-- doc/design.png
-- doc/design.uml
-- doc/writing_a_plugin.md
-- doc/i18n.md
-- config/cli_config.template.yml
+- doc/installation_deb.md
 - config/cli.modules.d/module_config_template.yml
+- config/cli_config.template.yml
 - README.md
 files:
+- lib/hammer_cli.rb
+- lib/hammer_cli/clamp.rb
+- lib/hammer_cli/options/option_definition.rb
+- lib/hammer_cli/options/normalizers.rb
+- lib/hammer_cli/logger.rb
+- lib/hammer_cli/messages.rb
+- lib/hammer_cli/main.rb
 - lib/hammer_cli/connection.rb
+- lib/hammer_cli/apipie.rb
+- lib/hammer_cli/settings.rb
+- lib/hammer_cli/completer.rb
+- lib/hammer_cli/modules.rb
+- lib/hammer_cli/exception_handler.rb
 - lib/hammer_cli/logger_watch.rb
 - lib/hammer_cli/i18n.rb
-- lib/hammer_cli/apipie/write_command.rb
+- lib/hammer_cli/apipie/command.rb
 - lib/hammer_cli/apipie/resource.rb
-- lib/hammer_cli/apipie/read_command.rb
+- lib/hammer_cli/apipie/option_builder.rb
 - lib/hammer_cli/apipie/options.rb
-- lib/hammer_cli/apipie/command.rb
-- lib/hammer_cli/logger.rb
-- lib/hammer_cli/messages.rb
-- lib/hammer_cli/exceptions.rb
-- lib/hammer_cli/abstract.rb
-- lib/hammer_cli/apipie.rb
 - lib/hammer_cli/version.rb
-- lib/hammer_cli/exception_handler.rb
-- lib/hammer_cli/output.rb
-- lib/hammer_cli/shell.rb
-- lib/hammer_cli/modules.rb
 - lib/hammer_cli/utils.rb
-- lib/hammer_cli/output/adapter/table.rb
+- lib/hammer_cli/exceptions.rb
+- lib/hammer_cli/validator.rb
+- lib/hammer_cli/output/adapter.rb
+- lib/hammer_cli/output/dsl.rb
+- lib/hammer_cli/output/record_collection.rb
+- lib/hammer_cli/output/adapter/csv.rb
 - lib/hammer_cli/output/adapter/base.rb
+- lib/hammer_cli/output/adapter/table.rb
 - lib/hammer_cli/output/adapter/abstract.rb
 - lib/hammer_cli/output/adapter/silent.rb
-- lib/hammer_cli/output/adapter/csv.rb
-- lib/hammer_cli/output/definition.rb
-- lib/hammer_cli/output/adapter.rb
-- lib/hammer_cli/output/dsl.rb
 - lib/hammer_cli/output/formatters.rb
-- lib/hammer_cli/output/output.rb
 - lib/hammer_cli/output/fields.rb
-- lib/hammer_cli/output/record_collection.rb
+- lib/hammer_cli/output/output.rb
+- lib/hammer_cli/output/definition.rb
 - lib/hammer_cli/output/field_filter.rb
-- lib/hammer_cli/options/option_definition.rb
-- lib/hammer_cli/options/normalizers.rb
-- lib/hammer_cli/completer.rb
-- lib/hammer_cli/settings.rb
-- lib/hammer_cli/validator.rb
+- lib/hammer_cli/option_builder.rb
+- lib/hammer_cli/output.rb
 - lib/hammer_cli/exit_codes.rb
-- lib/hammer_cli/main.rb
-- lib/hammer_cli.rb
-- test/unit/fixtures/apipie/documented.json
-- test/unit/fixtures/apipie/architectures.json
+- lib/hammer_cli/shell.rb
+- lib/hammer_cli/abstract.rb
+- test/unit/abstract_test.rb
+- test/unit/validator_test.rb
+- test/unit/main_test.rb
+- test/unit/options/field_filter_test.rb
+- test/unit/options/option_definition_test.rb
+- test/unit/options/normalizers_test.rb
+- test/unit/settings_test.rb
+- test/unit/exception_handler_test.rb
+- test/unit/utils_test.rb
 - test/unit/fixtures/json_input/valid.json
 - test/unit/fixtures/json_input/invalid.json
+- test/unit/fixtures/apipie/documented.json
+- test/unit/fixtures/apipie/architectures.json
 - test/unit/apipie/command_test.rb
-- test/unit/apipie/write_command_test.rb
-- test/unit/apipie/read_command_test.rb
-- test/unit/validator_test.rb
-- test/unit/history_test.rb
-- test/unit/completer_test.rb
-- test/unit/utils_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/main_test.rb
-- test/unit/test_helper.rb
-- test/unit/modules_test.rb
-- test/unit/abstract_test.rb
-- test/unit/output/adapter/base_test.rb
+- test/unit/apipie/option_builder_test.rb
+- test/unit/i18n_test.rb
+- test/unit/option_builder_test.rb
+- test/unit/output/fields_test.rb
 - test/unit/output/adapter/csv_test.rb
 - test/unit/output/adapter/abstract_test.rb
+- test/unit/output/adapter/base_test.rb
 - test/unit/output/adapter/table_test.rb
-- test/unit/output/formatters_test.rb
 - test/unit/output/dsl_test.rb
-- test/unit/output/definition_test.rb
 - test/unit/output/output_test.rb
-- test/unit/output/fields_test.rb
+- test/unit/output/formatters_test.rb
 - test/unit/output/record_collection_test.rb
-- test/unit/options/option_definition_test.rb
-- test/unit/options/normalizers_test.rb
-- test/unit/options/field_filter_test.rb
+- test/unit/output/definition_test.rb
+- test/unit/completer_test.rb
+- test/unit/history_test.rb
+- test/unit/modules_test.rb
+- test/unit/test_helper.rb
 - test/unit/connection_test.rb
-- test/unit/settings_test.rb
 - bin/hammer
-- doc/creating_apipie_commands.md
+- doc/option_builders.md
+- doc/design.uml
+- doc/writing_a_plugin.md
+- doc/installation_gem.md
+- doc/option_normalizers.md
 - doc/development_tips.md
+- doc/i18n.md
+- doc/creating_apipie_commands.md
 - doc/developer_docs.md
+- doc/design.png
 - doc/creating_commands.md
-- doc/option_normalizers.md
+- doc/installation_source.md
+- doc/installation_rpm.md
 - doc/installation.md
-- doc/design.png
-- doc/design.uml
-- doc/writing_a_plugin.md
-- doc/i18n.md
-- config/cli_config.template.yml
+- doc/installation_deb.md
 - config/cli.modules.d/module_config_template.yml
-- locale/zanata.xml
+- config/cli_config.template.yml
 - locale/hammer-cli.pot
 - locale/Makefile
+- locale/zanata.xml
 - LICENSE
 - README.md
 - hammer_cli_complete
@@ -310,40 +322,41 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Universal command-line interface
 test_files:
-- test/unit/fixtures/apipie/documented.json
-- test/unit/fixtures/apipie/architectures.json
+- test/unit/abstract_test.rb
+- test/unit/validator_test.rb
+- test/unit/main_test.rb
+- test/unit/options/field_filter_test.rb
+- test/unit/options/option_definition_test.rb
+- test/unit/options/normalizers_test.rb
+- test/unit/settings_test.rb
+- test/unit/exception_handler_test.rb
+- test/unit/utils_test.rb
 - test/unit/fixtures/json_input/valid.json
 - test/unit/fixtures/json_input/invalid.json
+- test/unit/fixtures/apipie/documented.json
+- test/unit/fixtures/apipie/architectures.json
 - test/unit/apipie/command_test.rb
-- test/unit/apipie/write_command_test.rb
-- test/unit/apipie/read_command_test.rb
-- test/unit/validator_test.rb
-- test/unit/history_test.rb
-- test/unit/completer_test.rb
-- test/unit/utils_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/main_test.rb
-- test/unit/test_helper.rb
-- test/unit/modules_test.rb
-- test/unit/abstract_test.rb
-- test/unit/output/adapter/base_test.rb
+- test/unit/apipie/option_builder_test.rb
+- test/unit/i18n_test.rb
+- test/unit/option_builder_test.rb
+- test/unit/output/fields_test.rb
 - test/unit/output/adapter/csv_test.rb
 - test/unit/output/adapter/abstract_test.rb
+- test/unit/output/adapter/base_test.rb
 - test/unit/output/adapter/table_test.rb
-- test/unit/output/formatters_test.rb
 - test/unit/output/dsl_test.rb
-- test/unit/output/definition_test.rb
 - test/unit/output/output_test.rb
-- test/unit/output/fields_test.rb
+- test/unit/output/formatters_test.rb
 - test/unit/output/record_collection_test.rb
-- test/unit/options/option_definition_test.rb
-- test/unit/options/normalizers_test.rb
-- test/unit/options/field_filter_test.rb
+- test/unit/output/definition_test.rb
+- test/unit/completer_test.rb
+- test/unit/history_test.rb
+- test/unit/modules_test.rb
+- test/unit/test_helper.rb
 - test/unit/connection_test.rb
-- test/unit/settings_test.rb
 has_rdoc: