omf_common 6.1.1.pre → 6.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 0e948a944605f5ab0e0231ec8ee213445de7cf20
-  data.tar.gz: 36a002c74f7189e7b2afa409682f486d7e9847c5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGUxNTcyOGZiMDI5Mjg0Zjg5ZDQxZjQ2OTg4OWYwNmVkMTcyZDczYw==
+  data.tar.gz: !binary |-
+    ZmQ3NzU1ZjdlOWU4ZDBmZjcxYjdmMDM0ZjQ1YTg3MDI5MmI2NmQ5Mg==
 SHA512:
-  metadata.gz: 7dffeb77f2c27c7a1e0ad6586766439fabbd3ad10fe0adbefb99eb47ffb6df4d5145d43005636df34dec79a7cf401bf6f079904b308d7d39af2c6761e43e2aa3
-  data.tar.gz: 89d7a98113d165e24d047b56e7aa27377e1fe8a74b0d68baead411bf376e4e62c505cdfb7d52cc7a5cdb4ccb21bea766742c355118425a7dc704104361961bf5
+  metadata.gz: !binary |-
+    YTY0MDgwNzMzNDY3YjFlNWZkOWE3NWFkZjljYWVmNWU0NGFmZGY4NGYzZWZj
+    MGUxYzlhNzZkNDk3YmFjMmQ3MGNhYmQ5MGM4ZGU2ZDU4OTk2ZDhlY2EwOWMw
+    MmU5MjUwODQ3MjU4ODg4YzVhYWM2OTc5MzMwZTU4ZDJkMmJkZGE=
+  data.tar.gz: !binary |-
+    ZmMyNjEzOWU1ZGEyZDI4MmRlNjYxMGRhMzE4NzkyNjk5YTA3YTJlNDk4YmM3
+    NTcwNTM2OWI2OTg3ODAwOWI3YmI5NDRlYWQ5ODg2OTg2ZTRkZjE2NGM1MTQz
+    NDAyMjBjNmUxNTE1ZTA0ZTY0NmZiMmExM2UyMzBmZjI5M2UyNGI=

data/Rakefile

@@ -3,8 +3,11 @@ require "bundler/gem_tasks"
 
 task :default => :test
 
+Rake::Task[:release].clear
+
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = "test/**/*_spec.rb"
   t.verbose = true
 end
+

data/lib/omf_common/version.rb

@@ -7,9 +7,16 @@ module OmfCommon
   PROTOCOL_VERSION = "6.0"
 
   def self.version_of(name)
-    git_tag  = `git describe --tags 2> /dev/null`
+    git_tag  = `git describe --tags 2> /dev/null`.chomp
+    git_root = `git root 2> /dev/null`.chomp
     gem_v = Gem.loaded_specs[name].version.to_s rescue '0.0.0'
-    git_tag.empty? ? gem_v : git_tag.gsub(/-/, '.').chomp
+
+    # Not in a development environment or git not present
+    if git_root != File.absolute_path("#{File.dirname(__FILE__)}/../../../") || git_tag.empty?
+      gem_v
+    else
+      git_tag.gsub(/-/, '.').gsub(/^v/, '')
+    end
   end
 
   VERSION = version_of('omf_common')

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.1.1.pre
+  version: 6.1.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,42 +42,42 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -154,56 +154,56 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Common library of OMF, a generic framework for controlling and managing
@@ -307,42 +307,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       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_common
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Common library of OMF
-test_files:
-- test/fixture/1st_level.pem
-- test/fixture/2nd_level.pem
-- test/fixture/3rd_level.pem
-- test/fixture/alice-cert.pem
-- test/fixture/alice-key.pem
-- test/fixture/omf_test.cert.pem
-- test/fixture/omf_test.pem
-- test/fixture/omf_test.pub
-- test/fixture/omf_test.pub.pem
-- test/fixture/pubsub.rb
-- test/fixture/rc.pem
-- test/fixture/root.pem
-- test/omf_common/auth/certificate_spec.rb
-- test/omf_common/auth/certificate_store_spec.rb
-- test/omf_common/auth/ssh_pub_key_convert_spec.rb
-- test/omf_common/comm/topic_spec.rb
-- test/omf_common/comm/xmpp/communicator_spec.rb
-- test/omf_common/comm/xmpp/topic_spec.rb
-- test/omf_common/comm_spec.rb
-- test/omf_common/command_spec.rb
-- test/omf_common/core_ext/string_spec.rb
-- test/omf_common/message/xml/message_spec.rb
-- test/omf_common/message_spec.rb
-- test/test_helper.rb
+test_files: []