kalibro_client 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c0ee391e685cb6a03a8c466df432f355274b40d
-  data.tar.gz: c7acea00d02253f5c744fc89604a9b929ce268ce
+  metadata.gz: 389fd917fcbbe1e5765f5f848cad583ecfaedc28
+  data.tar.gz: 42702af62588e9744a9895ccb2981fe7021f6278
 SHA512:
-  metadata.gz: 9ccce0b0cffbd54f5fc11fea11c2e26b3290004093886418c66239451d686270440d7316b11ad488c432487e233407dbdfd9fafd746c6df48e8e66290f5fe522
-  data.tar.gz: 2d54c3118a502214ef28a51757d26f133982f65e0a8b5314e14c0a2a8f3eb2373102ff319462d42b5dfa1b811b799fca165bd3459cc4c5cbb6394a21c339121e
+  metadata.gz: 3e8e4a35f7884b9ebcd87cd12bf7db909a631e5b59f33b6223e7b0ef8254c9d007f039e7bb918c5fb3da4cd6be5436ddd126a608b35a012a5fddcee0c7d7309c
+  data.tar.gz: bacc3234fcb2db12348c837fa32606a168a6c1d7296e7b915c0db392a2703c80f8ff65efc4d2c2784860ddb2b1b88083e520144ca1de84a95c0c56b9fd6d04fc

data/.travis.yml

@@ -6,7 +6,7 @@ addons:
   postgresql: "9.3"
 
 before_script:
-  - git clone https://github.com/mezuro/kalibro_install.git -b v2.6 kalibro_install
+  - git clone https://github.com/mezuro/kalibro_install.git -b v3.4 kalibro_install
   - pushd kalibro_install
     # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
   - sudo apt-get remove libzmq3

data/features/metric_configuration/creation.feature

@@ -9,3 +9,10 @@ Feature: Create
     And I have a reading group with name "Group"
     When I have a loc configuration within the given kalibro configuration
     Then the metric configuration should exist
+
+  @kalibro_configuration_restart
+  Scenario: creating a hotspot metric configuration
+    Given I have a kalibro configuration with name "Kalibro for Ruby"
+    When I have a flay configuration within the given kalibro configuration
+    Then the metric configuration should exist
+    And its metric should be Hotspot one

data/features/step_definitions/metric_configuration_steps.rb

@@ -36,6 +36,19 @@ When(/^I request all metric configurations of the given kalibro configuration$/)
   @metric_configurations = KalibroClient::Entities::Configurations::MetricConfiguration.metric_configurations_of(@kalibro_configuration.id)
 end
 
+When(/^I destroy the metric configuration$/) do
+  @metric_configuration.destroy
+end
+
+When(/^I have a flay configuration within the given kalibro configuration$/) do
+  @metric_configuration = FactoryGirl.create(:metric_configuration,
+                                             {metric: FactoryGirl.build(:hotspot_metric),
+                                              weight: nil,
+                                              aggregation_form: nil,
+                                              reading_group_id: nil,
+                                              kalibro_configuration_id: @kalibro_configuration.id})
+end
+
 Then(/^it should return the same metric configuration as the given one$/) do
   expect(@found_metric_configuration).to eq(@metric_configuration)
 end
@@ -48,14 +61,15 @@ Then(/^I should get an empty list of metric configurations$/) do
   expect(@metric_configurations).to eq([])
 end
 
-When(/^I destroy the metric configuration$/) do
-  @metric_configuration.destroy
-end
-
 Then(/^the metric configuration should no longer exist$/) do
   expect { KalibroClient::Entities::Configurations::MetricConfiguration.find(@metric_configuration.id)}.to raise_error(KalibroClient::Errors::RecordNotFound)
 end
 
 Then(/^the metric configuration should exist$/) do
-  expect(KalibroClient::Entities::Configurations::MetricConfiguration.find(@metric_configuration.id)).to eq(@metric_configuration)
+  @found_metric_configuration = KalibroClient::Entities::Configurations::MetricConfiguration.find(@metric_configuration.id)
+  expect(@found_metric_configuration).to eq(@metric_configuration)
+end
+
+Then(/^its metric should be Hotspot one$/) do
+  expect(@found_metric_configuration.metric).to be_a(KalibroClient::Entities::Miscellaneous::HotspotMetric)
 end

data/lib/kalibro_client/entities/configurations/metric_configuration.rb

@@ -37,6 +37,8 @@ module KalibroClient
           if value.is_a?(Hash)
             if value['type'] == "NativeMetricSnapshot"
               @metric = KalibroClient::Entities::Miscellaneous::NativeMetric.to_object(value)
+            elsif value['type'] == "HotspotMetricSnapshot"
+              @metric = KalibroClient::Entities::Miscellaneous::HotspotMetric.to_object(value)
             else
               @metric = KalibroClient::Entities::Miscellaneous::CompoundMetric.to_object(value)
             end
@@ -69,7 +71,7 @@ module KalibroClient
         def self.find(id)
           metric_configuration = request(':id', {id: id}, :get)
           raise KalibroClient::Errors::RecordNotFound unless metric_configuration['errors'].nil?
-          return new(metric_configuration['metric_configuration'])
+          return new(metric_configuration['metric_configuration'], true)
         end
 
         def self.exists?(id)

data/lib/kalibro_client/entities/miscellaneous/hotspot_metric.rb

@@ -0,0 +1,19 @@
+module KalibroClient
+  module Entities
+    module Miscellaneous
+      class HotspotMetric < NativeMetric
+        def initialize(name, code, languages, metric_collector_name)
+          super(name, code, KalibroClient::Entities::Miscellaneous::Granularity.new(:SOFTWARE), languages, metric_collector_name, 'HotspotMetricSnapshot')
+        end
+
+        def self.to_object(value)
+          if value.is_a?(Hash)
+            new(value['name'], value['code'], value['languages'], value['metric_collector_name'])
+          else
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kalibro_client/entities/miscellaneous/native_metric.rb

@@ -4,9 +4,8 @@ module KalibroClient
       class NativeMetric < Metric
         attr_accessor :languages, :metric_collector_name
 
-        # TODO: Deprecate this constructor
-        def initialize(name, code, scope, languages, metric_collector_name)
-          super('NativeMetricSnapshot', name, code, scope)
+        def initialize(name, code, scope, languages, metric_collector_name, type='NativeMetricSnapshot')
+          super(type, name, code, scope)
           @languages = languages
           @metric_collector_name = metric_collector_name
         end

data/lib/kalibro_client/entities.rb

@@ -28,6 +28,7 @@ require 'kalibro_client/entities/miscellaneous/date_module_result'
 require 'kalibro_client/entities/miscellaneous/metric'
 require 'kalibro_client/entities/miscellaneous/granularity'
 require 'kalibro_client/entities/miscellaneous/native_metric'
+require 'kalibro_client/entities/miscellaneous/hotspot_metric'
 require 'kalibro_client/entities/miscellaneous/compound_metric'
 require 'kalibro_client/entities/processor/base'
 require 'kalibro_client/entities/processor/metric_collector_details'

data/lib/kalibro_client/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module KalibroClient
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/spec/entities/configurations/metric_configuration_spec.rb

@@ -32,7 +32,6 @@ describe KalibroClient::Entities::Configurations::MetricConfiguration do
   end
 
   describe 'metric=' do
-
     context 'with a Hash' do
       context 'NativeMetric' do
         let!(:metric) { FactoryGirl.build(:loc) }
@@ -65,6 +64,22 @@ describe KalibroClient::Entities::Configurations::MetricConfiguration do
           expect(subject.metric).to eq(metric)
         end
       end
+
+      context 'HotspotMetric' do
+        let!(:metric) { FactoryGirl.build(:hotspot_metric) }
+
+        before :each do
+          KalibroClient::Entities::Miscellaneous::HotspotMetric.
+          expects(:to_object).at_least_once.
+          with(metric.to_hash).
+          returns(metric)
+        end
+
+        it 'should convert the argument and set the metric' do
+          subject.metric = metric.to_hash
+          expect(subject.metric).to eq(metric)
+        end
+      end
     end
 
     context 'with a Metric' do
@@ -190,8 +205,9 @@ describe KalibroClient::Entities::Configurations::MetricConfiguration do
       end
 
       it 'should return the metric_configuration' do
-        expect(KalibroClient::Entities::Configurations::MetricConfiguration.find(metric_configuration.id).
-          id).to eq(metric_configuration.id)
+        found_metric_configuration = KalibroClient::Entities::Configurations::MetricConfiguration.find(metric_configuration.id)
+        expect(found_metric_configuration.id).to eq(metric_configuration.id)
+        expect(found_metric_configuration.persisted).to be_truthy
       end
     end
 

data/spec/entities/miscellaneous/hotspot_metric_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe KalibroClient::Entities::Miscellaneous::HotspotMetric, :type => :model do
+  describe 'methods' do
+    describe 'initialize' do
+      context 'with valid attributes' do
+        let(:name){ "Sample name"}
+        let(:code){ "sample_code" }
+        let(:languages){  [:RUBY] }
+        let(:metric_collector_name){ "MetricFU" }
+        let(:hotspot_metric){ KalibroClient::Entities::Miscellaneous::HotspotMetric.new(name, code, languages, metric_collector_name) }
+
+        it 'is expected to return an instance of HotspotMetric' do
+          expect(hotspot_metric).to be_a(KalibroClient::Entities::Miscellaneous::HotspotMetric)
+        end
+
+        it 'is expected to have SOFTWARE as the default scope' do
+          expect(hotspot_metric.scope).to eq(KalibroClient::Entities::Miscellaneous::Granularity.new(:SOFTWARE))
+        end
+
+        it 'is expected to have HotspotMetricSnapshot type' do
+          expect(hotspot_metric.type).to eq("HotspotMetricSnapshot")
+        end
+      end
+    end
+
+    describe 'to_object' do
+      context 'with the expected attributes' do
+        let(:hotspot_metric_hash) { FactoryGirl.attributes_for(:hotspot_metric) }
+        it 'is expected to return a HotspotMetric' do
+          expect(KalibroClient::Entities::Miscellaneous::HotspotMetric.to_object(hotspot_metric_hash)).to be_a(KalibroClient::Entities::Miscellaneous::HotspotMetric)
+        end
+
+        context 'and with some extra attributes' do
+          let(:hotspot_metric_hash_extra) { hotspot_metric_hash.merge({"scope" => "SOFTWARE"}) }
+          it 'is expected to return a HotspotMetric' do
+            expect(KalibroClient::Entities::Miscellaneous::HotspotMetric.to_object(hotspot_metric_hash)).to be_a(KalibroClient::Entities::Miscellaneous::HotspotMetric)
+          end
+        end
+      end
+
+      context 'when the value is already an instance' do
+        let(:hotspot_metric) { FactoryGirl.build(:hotspot_metric) }
+        it 'is expected to return a HotspotMetric' do
+          expect(KalibroClient::Entities::Miscellaneous::HotspotMetric.to_object(hotspot_metric)).to be_a(KalibroClient::Entities::Miscellaneous::HotspotMetric)
+        end
+      end
+    end
+  end
+end

data/spec/entities/miscellaneous/native_metric_spec.rb

@@ -4,14 +4,14 @@ describe KalibroClient::Entities::Miscellaneous::NativeMetric, :type => :model d
   describe 'methods' do
     describe 'initialize' do
       context 'with valid attributes' do
-        name = "Sample name"
-        code = "sample_code"
-        scope = KalibroClient::Entities::Miscellaneous::Granularity.new(:SOFTWARE)
-        languages = [:C, :CPP, :JAVA]
-        metric_collector_name = "Analizo"
-        native_metric = KalibroClient::Entities::Miscellaneous::NativeMetric.new(name, code, scope, languages, metric_collector_name)
+        let(:name){ "Sample name" }
+        let(:code){ "sample_code" }
+        let(:scope){ KalibroClient::Entities::Miscellaneous::Granularity.new(:SOFTWARE) }
+        let(:languages){ [:C, :CPP, :JAVA] }
+        let(:metric_collector_name){ "Analizo" }
+        let(:native_metric){ KalibroClient::Entities::Miscellaneous::NativeMetric.new(name, code, scope, languages, metric_collector_name) }
 
-        it 'should return an instance of NativeMetric' do
+        it 'is expected to return an instance of NativeMetric' do
           expect(native_metric).to be_a(KalibroClient::Entities::Miscellaneous::NativeMetric)
         end
       end

data/spec/factories/metrics.rb

@@ -45,4 +45,14 @@ FactoryGirl.define do
 
     initialize_with { KalibroClient::Entities::Miscellaneous::CompoundMetric.new(name, code, scope, script) }
   end
+
+  factory :hotspot_metric, class: KalibroClient::Entities::Miscellaneous::HotspotMetric do
+    name "Flay"
+    code "flay"
+    description ""
+    metric_collector_name "MetricFu"
+    languages nil
+
+    initialize_with { KalibroClient::Entities::Miscellaneous::HotspotMetric.new(name, code, languages, metric_collector_name) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalibro_client
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel Quadros Miranda
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -278,6 +278,7 @@ files:
 - lib/kalibro_client/entities/miscellaneous/date_metric_result.rb
 - lib/kalibro_client/entities/miscellaneous/date_module_result.rb
 - lib/kalibro_client/entities/miscellaneous/granularity.rb
+- lib/kalibro_client/entities/miscellaneous/hotspot_metric.rb
 - lib/kalibro_client/entities/miscellaneous/metric.rb
 - lib/kalibro_client/entities/miscellaneous/native_metric.rb
 - lib/kalibro_client/entities/processor/base.rb
@@ -319,6 +320,7 @@ files:
 - spec/entities/miscellaneous/date_metric_result_spec.rb
 - spec/entities/miscellaneous/date_module_result_spec.rb
 - spec/entities/miscellaneous/granularity_spec.rb
+- spec/entities/miscellaneous/hotspot_metric_spec.rb
 - spec/entities/miscellaneous/metric_spec.rb
 - spec/entities/miscellaneous/native_metric_spec.rb
 - spec/entities/processor/base_spec.rb
@@ -379,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: KalibroClient is a communication interface with the KalibroProcessor and
@@ -470,6 +472,7 @@ test_files:
 - spec/entities/miscellaneous/date_metric_result_spec.rb
 - spec/entities/miscellaneous/date_module_result_spec.rb
 - spec/entities/miscellaneous/granularity_spec.rb
+- spec/entities/miscellaneous/hotspot_metric_spec.rb
 - spec/entities/miscellaneous/metric_spec.rb
 - spec/entities/miscellaneous/native_metric_spec.rb
 - spec/entities/processor/base_spec.rb