bixby-common 0.3.12 → 0.3.13

data/Gemfile

@@ -12,10 +12,10 @@ group :development do
   gem "jeweler", :git => "https://github.com/chetan/jeweler.git", :branch => "bixby"
   gem "pry"
 
-  gem "simplecov",    :platforms => [:mri_19, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
+  gem "simplecov",    :platforms => [:mri_19, :mri_20, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
   gem "rcov",         :platforms => :mri_18
 
-  gem "minitest",     :platforms => [:mri_19, :rbx]
+  gem "minitest",     "~> 4.0", :platforms => [:mri_19, :mri_20, :rbx]
   gem "test-unit",    :platforms => :mri_18
   gem "webmock",      :require => false
   gem "mocha",        :require => false
@@ -29,7 +29,7 @@ group :development do
 
   # platform specific gemms
   # not sure we need to include these at all
-  gem "json",         :platforms => [:jruby]
+  gem "json",         :platforms => [:mri, :jruby]
   gem "oj",           :platforms => [:mri, :rbx]
 
   gem "httpclient",   :platforms => [:jruby]

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 
 GIT
   remote: https://github.com/chetan/test_guard.git
-  revision: ad59542db1fca57018dd771d19b1d636252e4c98
+  revision: bbc871053ca91021eea412122035a9427748f8a5
   specs:
     test_guard (0.2.0)
       awesome_print
@@ -44,42 +44,46 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.3)
+    addressable (2.3.4)
     ansi (1.4.3)
     awesome_print (1.1.0)
     bouncy-castle-java (1.5.0147)
     coderay (1.0.9)
     colorize (0.5.8)
     columnize (0.3.6)
-    crack (0.3.2)
-    curb (0.8.3)
-    debugger (1.5.0)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
+    curb (0.8.4)
+    debugger (1.6.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.1)
     debugger-linecache (1.2.0)
     debugger-pry (0.1.1)
       debugger (~> 1)
       pry (>= 0.9.9)
-    debugger-ruby_core_source (1.2.0)
-    ffi (1.6.0)
-    ffi (1.6.0-java)
+    debugger-ruby_core_source (1.2.2)
+    ffi (1.8.1)
+    ffi (1.8.1-java)
     formatador (0.2.4)
     git (1.2.5)
     growl (1.0.3)
-    guard (1.7.0)
+    guard (1.8.0)
       formatador (>= 0.2.4)
-      listen (>= 0.6.0)
+      listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
     hirb (0.7.1)
     httpclient (2.3.3)
-    jruby-openssl (0.8.7)
+    jruby-openssl (0.8.8)
       bouncy-castle-java (>= 1.5.0147)
-    json (1.7.7)
-    json (1.7.7-java)
-    listen (0.7.3)
+    json (1.8.0)
+    json (1.8.0-java)
+    listen (1.1.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     little-plugger (1.1.3)
     logging (1.8.1)
       little-plugger (>= 1.1.3)
@@ -87,16 +91,16 @@ GEM
     lumberjack (1.0.3)
     metaclass (0.0.1)
     method_source (0.8.1)
-    minitest (4.7.0)
-    mocha (0.13.3)
+    minitest (4.7.4)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
-    oj (2.0.10)
-    pry (0.9.12)
+    multi_json (1.7.6)
+    oj (2.0.14)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12-java)
+    pry (0.9.12.2-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -108,9 +112,12 @@ GEM
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rcov (1.0.0)
     rdoc (4.0.1)
       json (~> 1.4)
+    safe_yaml (0.9.3)
     simplecov-console (0.1.1)
       colorize
       hirb
@@ -118,17 +125,17 @@ GEM
     simplecov-html (0.7.1)
     single_test (0.5.2)
       rake (> 0.9)
-    slop (3.4.4)
-    spoon (0.0.3)
+    slop (3.4.5)
+    spoon (0.0.4)
       ffi
-    test-unit (2.5.4)
+    test-unit (2.5.5)
     thor (0.18.1)
     turn (0.9.6)
       ansi
     webmock (1.11.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    yard (0.8.5.2)
+    yard (0.8.6.1)
 
 PLATFORMS
   java
@@ -143,7 +150,7 @@ DEPENDENCIES
   jruby-openssl
   json
   logging
-  minitest
+  minitest (~> 4.0)
   mocha
   multi_json
   oj

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/bixby-common.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-05-18"
+  s.date = "2013-06-06"
   s.description = "Bixby Common files/libs"
   s.email = "chetan@pixelcop.net"
   s.files = [
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, ["~> 4.0"])
       s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
@@ -92,7 +92,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<minitest>, ["~> 4.0"])
       s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
@@ -117,7 +117,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<minitest>, ["~> 4.0"])
     s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])

data/lib/bixby_common/command_spec.rb

@@ -68,7 +68,7 @@ class CommandSpec
   end
 
   def command_file
-    File.join(self.bundle_dir, "bin", @command)
+    path("bin", @command)
   end
 
   def command_exists?
@@ -88,7 +88,7 @@ class CommandSpec
   end
 
   def digest_file
-    File.join(self.bundle_dir, "digest")
+    path("digest")
   end
 
   def load_digest
@@ -99,6 +99,23 @@ class CommandSpec
     nil
   end
 
+  def load_manifest
+    begin
+      return MultiJson.load(path("manifest.json"))
+    rescue => ex
+    end
+    nil
+  end
+
+  # Create and return an absolute pathname pointing to the given file
+  #
+  # @param [String] *relative
+  #
+  # @return [String]
+  def path(*relative)
+    File.join(self.bundle_dir, *relative)
+  end
+
   def update_digest
 
     path = self.bundle_dir
@@ -114,6 +131,7 @@ class CommandSpec
     end
 
     @digest = { :digest => bundle_sha.hexdigest(), :files => digests }
+    MultiJson.load_adapter(:json_gem).activate!
     File.open(path+"/digest", 'w'){ |f|
       f.write(MultiJson.dump(@digest, :pretty => true, :adapter => :json_gem) + "\n")
     }

data/lib/bixby_common/util/crypto_util.rb

@@ -59,7 +59,7 @@ module Bixby
         data = StringIO.new(c.update(payload) + c.final)
 
         ts = data.readline.strip
-        if (Time.new.to_i - ts.to_i) > 60 then
+        if (Time.new.to_i - ts.to_i) > 900 then # must be within last 15 min
           raise Bixby::EncryptionError, "payload verification failed", caller
         end
 

data/lib/bixby_common/util/log.rb

@@ -14,6 +14,7 @@ module Bixby
     def log
       @log ||= Logging.logger[self]
     end
+    alias_method :logger, :log
 
     # Create a method for each log level. Allows receiver to simply call
     #

metadata

@@ -2,14 +2,14 @@
 name: bixby-common
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -160,16 +160,16 @@ dependencies:
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
     none: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
     none: false
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -431,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 3162733715689227796
+      hash: -2334506530197653081
       segments:
       - 0
       version: '0'