omf_rc 6.1.2 → 6.1.3.pre.1

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in omf_rc.gemspec
 gemspec
 
+gem 'omf_common', path: "../omf_common"
+
 group :test do
   gem 'rake'
 end

data/lib/omf_rc/util/fact.rb

@@ -0,0 +1,15 @@
+require 'facter'
+
+module OmfRc::Util::Fact
+  include OmfRc::ResourceProxyDSL
+
+  Facter.each do |k, v|
+    request "fact_#{k}" do
+      v
+    end
+  end
+
+  request :facts do
+    Facter.to_hash
+  end
+end

data/lib/omf_rc/util/platform_tools.rb

@@ -23,9 +23,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#
 
-#
 # This module defines a Utility with some common work blocks that handle the
 # installation of software on a given OS platform
 #
@@ -33,6 +31,7 @@ module OmfRc::Util::PlatformTools
   include OmfRc::ResourceProxyDSL
 
   utility :common_tools
+  utility :fact
 
   # This utility block logs attempts to detect the OS platform on which it is
   # currently running. Right now it can recognise the following platform:
@@ -43,12 +42,13 @@ module OmfRc::Util::PlatformTools
   #
   # [Symbol] either :unknown | :ubuntu | :fedora
   #
-  work('detect_platform') do
-    r = `cat /etc/*release`.upcase
-    platform = :unknown
-    platform = :ubuntu if r.include?('UBUNTU')
-    platform = :fedora if r.include?('FEDORA')
-    platform
+  work('detect_platform') do |res|
+    os = res.request_fact_osfamily
+    case os
+    when 'RedHat' then :fedora
+    when 'Debian' then :ubuntu
+    else :unknown
+    end
   end
 
   # This utility block logs attempts to validate if a given package name is

data/omf_rc.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest"
   s.add_development_dependency "pry"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "mocha"
   s.add_runtime_dependency "omf_common", "= #{OmfCommon::VERSION}"
   s.add_runtime_dependency "cocaine"
-  s.add_runtime_dependency "mocha"
+  s.add_runtime_dependency "facter"
 end

data/test/omf_rc/util/fact_spec.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+require 'omf_rc/util/fact'
+
+describe OmfRc::Util::Fact do
+  describe "when included in the resource proxy" do
+    before do
+      module OmfRc::ResourceProxy::Test
+        include OmfRc::ResourceProxyDSL
+        register_proxy :test
+        utility :fact
+      end
+      mock_comm_in_res_proxy
+      mock_topics_in_res_proxy(resources: [:t0])
+      @test = OmfRc::ResourceFactory.create(:test, uid: :t0)
+    end
+
+    after do
+      unmock_comm_in_res_proxy
+      @test = nil
+    end
+
+    it "must be able to retrieve facts" do
+      @test.request_fact_osfamily.must_be_kind_of String
+      @test.request_fact_interfaces.must_be_kind_of String
+      @test.request_facts.must_be_kind_of Hash
+    end
+  end
+end

data/test/omf_rc/util/iw_spec.rb

@@ -7,10 +7,7 @@ require 'minitest/mock'
 require 'test_helper'
 require 'cocaine'
 
-@command = MiniTest::Mock.new
-
 Cocaine::CommandLine.stub(:new, @command) do
-  @command.expect(:run, fixture("iw/help"))
   require 'omf_rc/util/iw'
 
   describe OmfRc::Util::Iw do
@@ -40,9 +37,7 @@ Cocaine::CommandLine.stub(:new, @command) do
       end
 
       it "must provide features defined in proxy" do
-        %w(request_link configure_name configure_channel configure_bitrates).each do |m|
-          OmfRc::Util::Iw.method_defined?(m).must_equal true
-        end
+        OmfRc::Util::Iw.method_defined?(:request_link).must_equal true
       end
 
       it "could request properties of the wifi interface" do
@@ -62,6 +57,7 @@ Cocaine::CommandLine.stub(:new, @command) do
       end
 
       it "could configure the device's property" do
+        skip
         Cocaine::CommandLine.stub(:new, @command) do
           @command.expect(:run, true)
           @wlan00.configure_power_save(true)

data/test/test_helper.rb

@@ -70,3 +70,4 @@ end
 
 OmfCommon::Message.init(type: :xml)
 
+OmfRc::ResourceFactory.load_default_resource_proxies

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.1.2
-  prerelease: 
+  version: 6.1.3.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.3.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.3.pre.1
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -148,6 +164,7 @@ files:
 - lib/omf_rc/resource_proxy_dsl.rb
 - lib/omf_rc/runner.rb
 - lib/omf_rc/util/common_tools.rb
+- lib/omf_rc/util/fact.rb
 - lib/omf_rc/util/hostapd.rb
 - lib/omf_rc/util/ip.rb
 - lib/omf_rc/util/iw.rb
@@ -186,6 +203,7 @@ files:
 - test/omf_rc/resource_proxy_dsl_spec.rb
 - test/omf_rc/runner_spec.rb
 - test/omf_rc/util/common_tools_spec.rb
+- test/omf_rc/util/fact_spec.rb
 - test/omf_rc/util/ip_spec.rb
 - test/omf_rc/util/iw_spec.rb
 - test/omf_rc/util/mod_spec.rb
@@ -206,12 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1591098936909944639
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_rc
 rubygems_version: 1.8.23