fluent-plugin-specinfra_inventory 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325affa217ecd8c5f86d51dd3f3f58f22109987f
-  data.tar.gz: 70ca87f72c046b39af42a84369e7bfba3d7643c4
+  metadata.gz: 3c9298f6319f6d53a76d0df249610c062c8f943c
+  data.tar.gz: 8c9ec9f5d57893d19f15e70500781bc765f5ac9d
 SHA512:
-  metadata.gz: 28c37fffa02f61402657823d1a2c9c1ee48a10182b186cb2aa1db190e3b8dcaf93cc73a9d5606a83de7903ee433593a14ced51c33a5fc2602b5ec35d72bb0946
-  data.tar.gz: 3f4113a574a90ba4eee593afe8a22714744318a215389b2e899d2d7513d7ee1d2fa52dbf8a41cd32dc62558477d4584fc34bf7e0c6c11e5dce55b624c1fc2e5d
+  metadata.gz: 45ed2d49b08f0172b6c9af7a93a667566503cfd66a12b3f9e5ff7f5b8eff63cc3ff5ebd9f7bb613acc37fa2c19fe915b9cb64a8aedbf8ce73807e3cebe0bd2f0
+  data.tar.gz: d1b88e2d21aa0e83f8120dd36716da03fb255b6f9f33b03cbe50c110ab9984289f33b981c8ec6c5990abeed86a1ec71ef4238b0b0f7c3043aa7e945aba74faa1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+* Add `cast_num` option
+* Add `cast_byte` option
+* Add `cast_percent` option
+
 ## 0.1.0
 
 * Change default value of `inventory_keys` option  
@@ -5,7 +11,7 @@
 
 ## 0.0.5
 
-* Add combine option
+* Add `combine` option
 
 ## 0.0.4
 

data/README.md

@@ -29,6 +29,9 @@ Or install it yourself as:
   inventory_keys ["cpu.total","memory"]
   combine        false
   family         ubuntu
+  cast_num       true
+  cast_byte      true
+  cast_percent   true
   release        14.04
   arch           x86_64
   path           /user/local/bin
@@ -45,8 +48,8 @@ defualt: `60`
 
 ### tag_prefix
 Prefix of tags of events.  
-Event tags are added together inventory key at the end. like: `example.prefix.cpu`  
-If you set `true` to `combine` option, It does not added the key at the end.
+Event tags are added together inventory key at the end(like: `example.prefix.cpu`)  
+If you set `true` to `combine` option, It does not added the key at the end.  
 default: `specinfra.inventory`
 
 ### backend
@@ -62,6 +65,18 @@ default: All available keys of `Specinfra::HostInventory`
 Combining values of `inventory_keys` to one record.  
 default: `true`
 
+### cast_num
+Cast all number value to integer.  
+default: `false`
+
+### cast_byte
+Cast all byte value(like `512KB`) to integer.  
+default: `false`
+
+### cast_percent
+Cast all percentile value(like `50%`) to integer.  
+default: `false`
+
 ### family, release, arch
 See [Multi OS Support](http://serverspec.org/tutorial.html)
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/*_spec.rb'
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
 task :default => [:spec]

data/lib/fluent/plugin/in_specinfra_inventory.rb

@@ -15,6 +15,9 @@ module Fluent
     config_param :env,            :hash,    default: {}
     config_param :inventory_keys, :array,   default: []
     config_param :combine,        :bool,    default: true
+    config_param :cast_num,       :bool,    default: false
+    config_param :cast_byte,      :bool,    default: false
+    config_param :cast_percent,   :bool,    default: false
 
     KEY_DELIMITER = "."
 
@@ -95,8 +98,39 @@ module Fluent
       key.split(KEY_DELIMITER).each do |k|
         inv = inv[k]
       end
-      {key => inv}
+      {key => cast(inv)}
     end
 
+    def cast(inv)
+      if @cast_num || @cast_byte || @cast_percent
+        if inv.is_a?(Hash)
+          inv = Hash[inv.map { |k,v| [k, cast(v)] }]
+        elsif inv.is_a?(Array)
+          inv = inv.map do |v|
+            v = cast(v)
+          end
+        else
+          inv = _cast_num(inv) if @cast_num && inv.is_a?(String)
+          inv = _cast_byte(inv) if @cast_byte && inv.is_a?(String)
+          inv = _cast_percent(inv) if @cast_percent && inv.is_a?(String)
+        end
+      end
+      inv
+    end
+
+    def _cast_num(v)
+      m = v.match(/^([1-9]\d*|0)$/)
+      m.nil? ? v : m[0].to_i
+    end
+
+    def _cast_byte(v)
+      m = v.match(/^(\d+)(kb|KB)$/)
+      m.nil? ? v : m[0].to_i * 1000
+    end
+
+    def _cast_percent(v)
+      m = v.match(/^(\d+)%$/)
+      m.nil? ? v : m[0].to_i
+    end
   end
 end

data/lib/fluent/plugin/specinfra_inventory/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module SpecinfraInventory
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

data/spec/in_specinfra_inventory_spec.rb

@@ -9,7 +9,8 @@ describe Fluent::SpecinfraInventoryInput do
       'cpu' => {
         'total' => "2",
         '0' => {
-          'vendor_id' => "1"
+          'vendor_id' => "1",
+          'cache_size' => "512KB"
         }
       }
     }
@@ -28,6 +29,10 @@ describe Fluent::SpecinfraInventoryInput do
       host           localhost
       ssh_user       test-user
       ssh_port       2222
+      combine        false
+      cast_num       true
+      cast_byte      true
+      cast_percent   true
       env            {"TEST_ENV": "test_value"}
     ]
   end
@@ -44,6 +49,10 @@ describe Fluent::SpecinfraInventoryInput do
     example { expect(@d.instance.host).to eq "localhost" }
     example { expect(@d.instance.ssh_user).to eq "test-user" }
     example { expect(@d.instance.ssh_port).to eq 2222 }
+    example { expect(@d.instance.combine).to eq false }
+    example { expect(@d.instance.cast_num).to eq true }
+    example { expect(@d.instance.cast_byte).to eq true }
+    example { expect(@d.instance.cast_percent).to eq true }
     example { expect(@d.instance.env).to include('TEST_ENV' => 'test_value') }
   end
 
@@ -52,10 +61,35 @@ describe Fluent::SpecinfraInventoryInput do
   end
 
   describe "record on flat hash" do
-    example { expect(@d.instance.record("cpu")['cpu']).to include('total' => "2") }
+    example { expect(@d.instance.record("cpu")['cpu']).to include('total' => 2) }
   end
 
   describe "record on nested hash" do
-    example { expect(@d.instance.record("cpu.0")['cpu.0']).to include('vendor_id' => "1") }
+    example { expect(@d.instance.record("cpu.0")['cpu.0']).to include('vendor_id' => 1) }
+    example { expect(@d.instance.record("cpu.0")['cpu.0']).to include('cache_size' => 512000) }
+  end
+
+  describe "cast_num" do
+    example { expect(@d.instance._cast_num("0")).to eq 0 }
+    example { expect(@d.instance._cast_num("1")).to eq 1 }
+    example { expect(@d.instance._cast_num("109")).to eq 109 }
+    example { expect(@d.instance._cast_num("01")).to eq "01" }
+    example { expect(@d.instance._cast_num("test")).to eq "test" }
+  end
+
+  describe "cast_byte" do
+    example { expect(@d.instance._cast_byte("12")).to eq "12" }
+    example { expect(@d.instance._cast_byte("0kb")).to eq 0 }
+    example { expect(@d.instance._cast_byte("99kb")).to eq 99000 }
+    example { expect(@d.instance._cast_byte("akb")).to eq "akb" }
+    example { expect(@d.instance._cast_byte("1%")).to eq "1%" }
+  end
+
+  describe "cast_percent" do
+    example { expect(@d.instance._cast_percent("99")).to eq "99" }
+    example { expect(@d.instance._cast_percent("77%")).to eq 77 }
+    example { expect(@d.instance._cast_percent("0%")).to eq 0 }
+    example { expect(@d.instance._cast_percent("percent")).to eq "percent" }
+    example { expect(@d.instance._cast_percent("s%")).to eq "s%" }
   end
 end

data/spec/spec_helper.rb

@@ -1,79 +1,5 @@
-require 'coveralls'
-Coveralls.wear!
-
 require 'fluent/load'
 require 'fluent/test'
 
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
-end
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-specinfra_inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -102,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile

data/.rspec

@@ -1,2 +0,0 @@
---color
---require spec_helper