ocean-rails 1.18.8 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f723a5789804d1b39bb4397d61b7ec794102b403
-  data.tar.gz: b12da0d1f18218b212734998cd21b2274b7d55d5
+  metadata.gz: 7b07c48320b0fb3b254c5fb015b1dbc170459c61
+  data.tar.gz: 9523c8b17736174826d5a6e56c5b9fa27ef8f76e
 SHA512:
-  metadata.gz: 142402aad49ef24e397d48ec62873ef430aea063da8a24802e13e6f41107607715c446ccb5f50ac450bcf23d85a51a3aa53858c8525a712321f99f40c5eada8e
-  data.tar.gz: d15c893f5f6b302c16ef1af3eeeeeab20c361ad5ee639849c39b2804678e77c46d99cc77463e1a5203580cbbcb6f651f112667940849af4e8b31c062db16a273
+  metadata.gz: dd8728127e2c3ab22ed3ef365b4773a70a8cba8a50847f4b67de195dea89dff948bc471f183627f89f320bca4ed1b8de832a3f4ab382dddf986c2bf2cb210a18
+  data.tar.gz: a707f37e89bf9a56e1efba51b8a50cf33af207026daf4d254906cf9b9dd476f1ac1b33595156c3b1dd052d3f445cb72e90e4418ef8be2f66759d051dc48eee8d

data/README.rdoc

@@ -7,8 +7,9 @@ Ocean requires Ruby 2.0 and Ruby on Rails 4.0.0 or later.
 
 {<img src="https://badge.fury.io/rb/ocean-rails.png" alt="Gem Version" />}[http://badge.fury.io/rb/ocean-rails]
 
+
 === Documentation
-* Ocean gem API: http://rdoc.info/github/OceanDev/ocean-rails
+* Ocean gem API: http://rdoc.info/github/OceanDev/ocean-rails/frames
 * Ocean gem on Rubygems: https://rubygems.org/gems/ocean-rails
 * Ocean framework: http://wiki.oceanframework.net
 * Ocean mailing list: http://groups.google.com/group/oceanframework
@@ -33,11 +34,8 @@ same directory for reference. Don't change it: it is under version control. The
 you should change, <code>config/config.yml</code>, isn't, as it will contain site-specific and/or
 confidential data.
 
-Verify that your setup is OK by executing
-
- rspec
-
-All tests should pass.
+There are no specs to run at this point: all functionality provided by the +ocean-rails+
+gem already is exhaustively tested in the +ocean-rails+ spec suite.
 
 
 === Creating an Ocean Resource

data/lib/ocean/api.rb

@@ -48,6 +48,30 @@ class Api
   end
       
   
+  #
+  # Adds environment info to the basename, so that testing and execution in various combinations
+  # of the Rails env and the Chef environment can be done without collision. 
+  #
+  # The chef_env will always be appended to the basename, since we never want to share queues 
+  # between different Chef environments. 
+  #
+  # If the chef_env is 'dev' or 'ci', we must separate things as much as
+  # possible: therefore, we add the local IP number and the Rails environment. 
+  #
+  # We also add the same information if by any chance the Rails environment isn't 'production'. 
+  # This is a precaution; in staging and prod apps should always run in Rails production mode, 
+  # but if by mistake they don't, we must prevent the production queues from being touched.
+  #
+  def self.adorn_basename(basename, chef_env: "dev", rails_env: "development")
+    fullname = "#{basename}_#{chef_env}"
+    if rails_env != 'production' || chef_env == 'dev' || chef_env == 'ci'
+      local_ip = UDPSocket.open {|s| s.connect("64.233.187.99", 1); s.addr.last}.gsub('.', '-')
+      fullname += "_#{local_ip}_#{rails_env}"
+    end
+    fullname
+  end
+
+
   #
   # Makes a HTTP request to +host_url+ using the HTTP method +method+. The +resource_name+
   # is used to obtain the latest version string of the resource. The arg +path+ is the

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.18.8"
+  VERSION = "1.19.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.18.8
+  version: 1.19.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement