omf_rc 6.2.0.pre.2 → 6.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjY2Njk0NjBhZDdiZTU5Nzg0MjNiY2Y4MDI2MDM1NjM0ZGEzZjgzZQ==
+    MWExNjdlOTM2YTM4MzIxMmU5M2ZlM2ZiYWQ0NjFhNmFmODdhZTMzOA==
   data.tar.gz: !binary |-
-    N2U3NzA5YWQ1ZWU0YmYxMzlhMDU1YTI3MzRjODE5ZDc1ZjE2YzdiNw==
+    ZWU2YzExMzhhYWU4OTMwY2NjMjlmNGI2YjAwZmVhYTBmNDMyNGVkYw==
 SHA512:
   metadata.gz: !binary |-
-    NWRjOTExNDVlODBlNzVmNDliNzMzNzZhOTJlYTJlNDZhYmM5NTJlZWRjMzhh
-    OTEwNjE4MzA0ODNmMTg3YTY2ZTExYmZhMjM1YTc2NTk5ODhkZjRjZDBhODgz
-    M2M3MTYzYTEzY2NkMmM2MDhjYTk0YWQyNmNhZjcwMmVhYzQ2NWM=
+    MjE4ZDhlOGM5MjlmZTU2NDZjYzdiNmQzYmRmMTIzZmEzZjY1ZWMyNjM1YzVk
+    NDlkNTNlMzQ5NWRjNjM5NjBiNDAwZWUzNjQ4MGFkNWM5OWJmMjM1YWE4YWRi
+    ZjA5MTk2YmUyMDExN2VhZmJiZGQzYWUyZDcyYjMzNWM5OGUwYjM=
   data.tar.gz: !binary |-
-    YzA5NGY3NWU2YmNiN2E4YzViNjc2NGRhOTIxZTMyMmZhYWUzZTgzMjI1ZTE4
-    MmMxODlkNmZmZmQyNTUwODcxZmQwZjU0Y2M3NmJjZWEzZDUyMmI1NDI4ZWRi
-    N2RlN2IyMzk4YTQ3OTc1YmY1NTljOWNhYjg1MDM0Y2Q1MjU0OTc=
+    YTA4MmFhMDQwZTY2M2E5ZjQ1ZGNiNzMwMzYzMzg1ZDhkNTBkMDNjODI4NWIw
+    OTM5OTI5MThiOTBmNTVkMDgwZGE5NDVjNmMzMWExYzkwYjEwNDZkNGI5ZmIz
+    ZDE5ODczZDhjZWVkMTY3MzJlMzA2NjkwNGY1NzA4NTIzNzY2Mjk=

data/lib/omf_rc/resource_proxy/application.rb

@@ -283,7 +283,10 @@ module OmfRc::ResourceProxy::Application
       when :running then res.switch_to_running
       when :paused then res.switch_to_paused
       else
-        res.log_inform_warn "Cannot switch application to unknown state '#{value.to_s}'!"
+        # It is OK to create an APP with state :created
+        unless res.property.state == :created
+          res.log_inform_warn "Cannot switch application to unknown state '#{value.to_s}'!"
+        end
       end
     end
     res.property.state
@@ -330,23 +333,19 @@ module OmfRc::ResourceProxy::Application
   work('switch_to_stopped') do |res|
     if res.property.state == :running || res.property.state == :paused
       id = res.property.app_id
-      unless ExecApp[id].nil?
-        # stop this app
-        begin
-          # first, try sending 'exit' on the stdin of the app, and wait
-          # for 4s to see if the app acted on it...
-          ExecApp[id].stdin('exit')
-          sleep 4
-          unless ExecApp[id].nil?
-            # second, try sending TERM signal, wait another 4s to see
-            # if the app acted on it...
-            ExecApp[id].signal('TERM')
-            sleep 4
-            # finally, try sending KILL signal
-            ExecApp[id].signal('KILL') unless ExecApp[id].nil?
-          end
-          res.property.state = :stopped
-        rescue => err
+      # stop this app
+      # first, try sending 'exit' on the stdin of the app, and wait
+      # for 4s to see if the app acted on it...
+      ExecApp.has?(id) ? (ExecApp[id].stdin('exit') rescue nil) : res.property.state = :stopped
+
+      OmfCommon.el.after(4) do
+        # second, try sending TERM signal, wait another 4s to see
+        # if the app acted on it...
+        ExecApp.has?(id) ? (ExecApp[id].signal('TERM') rescue nil) : res.property.state = :stopped
+
+        OmfCommon.el.after(4) do
+          # finally, try sending KILL signal
+          ExecApp.has?(id) ? (ExecApp[id].signal('KILL') rescue nil) : res.property.state = :stopped
         end
       end
     end

data/test/omf_rc/resource_factory_spec.rb

@@ -10,7 +10,7 @@ describe OmfRc::ResourceFactory do
   describe "when resource proxies loaded" do
     before do
       @xmpp = MiniTest::Mock.new
-      @xmpp.expect(:subscribe, true, [String])
+      @xmpp.expect(:subscribe, true, [String, Hash])
     end
 
     it "must have list of registered proxies and utilities" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.2.0.pre.2
+  version: 6.2.0
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0.pre.2
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0.pre.2
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
@@ -209,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_rc
 rubygems_version: 2.4.2