oni 3.1.0 → 3.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTRkYjE1M2NkYjFkZjRjNzliMTRlNzMyNzgxYTY4ZGM4MjMwNWI2MA==
-  data.tar.gz: !binary |-
-    YzAwOWVlYzI1NDg3Y2ZhMzNlOWRhZmMxYTYyNTcwNzIyZTdjZGJhZg==
+SHA1:
+  metadata.gz: 496b21105a465b6ad75b69b7dc1e9162bac470c7
+  data.tar.gz: 1b57098cd64f7ea40f0a805958a3142d5b066a33
 SHA512:
-  metadata.gz: !binary |-
-    NGI3ODc5Mzc3MGRjOTRiNDAzYTJkNzM2M2UzYTYxMmY4N2VlODBkMzEwNWNj
-    MTRiYzM3N2QzODg5OGJlZjZjNmYzNWJjNWEyMGM1N2VlZWE2ZDJlNjc4Yjg5
-    YmRkNjE4ZDJlNTk2YTM5MjU4NGQ0YjJhNjk0ZmYxNmFkMGJlZTg=
-  data.tar.gz: !binary |-
-    M2E2NTZmZjY3MDI3OTA2ZDQ2ZjkzN2I0NmY3Mjg5MGI5NDdiYmVhNGY2NmNj
-    MjRiOGY1MGEzODY0MzYwNzNkMDc4ZmMyNTBhMzY2MTE3YjkwMWU2MTQ0MThi
-    Yjc0YzAyZDAwNWQ3Y2JlZjhiOWY0MTNmMTY5ZDhhMmE2OGJkNmY=
+  metadata.gz: b6d009276db8c4eb6ed65df8cc82077b1083c87062781937aa427f075b7915824d65078aeb7cca9c1a96be3fbbf203dc6db34a0678cfd1a1c4ec41e9459c4446
+  data.tar.gz: 372078703c73e14fb5c226049bc87930821713dff25f9df4c05a10edcaa2cfa51cc3b8b4f6c3d61765d00fcfd490aabeda106a0b875731e4ab6ae55322fe326a

data/.travis.yml

@@ -3,12 +3,10 @@ script: bundle exec rake
 
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0-preview1
+  - 2.0
+  - 2.1
   - jruby
-  - jruby-head
-  - jruby-1.7.4
-  - rbx-2.2.1
+  - rbx-2.2
 
 notifications:
   email:

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org/'
 
 gemspec
-
-group :testing do
-  gem 'rubysl', :platform => :rbx
-end

data/README.md

@@ -124,19 +124,37 @@ Basic usage of Oni is as following:
 
     require 'oni'
 
-    class MyWorker < Oni::Worker
-      def initialize(number)
-        @number = number
+    # This example defines 3 classes: MyDaemon, MyMapper and MyWorker.
+    # Combined they form the basic structure of an Oni Daemon.
+
+    class MyDaemon < Oni::Daemon
+      set :mapper, MyMapper
+      set :worker, MyWorker
+
+      # Here you'd receive your message, e.g. from a queue. We'll use static
+      # data as an example.
+      def receive
+        yield({:number => 10})
       end
 
-      def process
-        return @number * 2
+      # This would get executed upon completion of a job.
+      def complete(message, result, timings)
+        puts result
       end
     end
 
     class MyMapper < Oni::Mapper
+      # Map the input given by MyDaemon#receive into the right arguments
+      # for MyWorker#initialize. 
+      #
+      # NOTE: the return value should be an Array. 
+      # Oni calls #to_a on the output (more specifically we use a splat) so your 
+      # return value should be an Array. If you do not return an Array you risk
+      # that the object you return will wrongfully be converted into an Array.
+      # This is painful when it comes to Hashes, which, after the #to_a call
+      # will be converted into arrays of values in stead of your intended hash.
       def map_input(input)
-        return input[:number]
+        return [input[:number]]
       end
 
       def map_output(output)
@@ -144,19 +162,13 @@ Basic usage of Oni is as following:
       end
     end
 
-    class MyDaemon < Oni::Daemon
-      set :mapper, MyMapper
-      set :worker, MyWorker
-
-      # Here you'd receive your message, e.g. from a queue. We'll use static
-      # data as an example.
-      def receive
-        yield({:number => 10})
+    class MyWorker < Oni::Worker
+      def initialize(number)
+        @number = number
       end
 
-      # This would get executed upon completion of a job.
-      def complete(message, result, timings)
-        puts result
+      def process
+        return @number * 2
       end
     end
 

data/Rakefile

@@ -2,7 +2,6 @@ require_relative 'lib/oni/version'
 
 require 'rake/clean'
 require 'bundler/gem_tasks'
-require 'ci/reporter/rake/rspec'
 
 CLEAN.include('coverage', 'yardoc')
 

data/doc/changelog.md

@@ -1,6 +1,11 @@
 # @title Changelog
 # Changelog
 
+## 3.1.1 - February 20th, 2015
+
+Oni now depends on version 1 of the AWS SDK (`aws-sdk-v1`) due to the `aws-sdk`
+now installing version 2 (which is not compatible).
+
 ## 3.1.0 - December 17th, 2013
 
 Added the `Oni::WrappedError` class that can be used to wrap existing error

data/lib/oni/daemons/sqs.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-v1'
 
 module Oni
   module Daemons

data/lib/oni/version.rb

@@ -1,3 +1,3 @@
 module Oni
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end # Oni

data/lib/oni/wrapped_error.rb

@@ -18,7 +18,7 @@ module Oni
     #
     # @param [StandardError] error
     # @param [Mixed] parameters
-    # @return [FeedbackDaemon::WorkerError]
+    # @return [Oni::WrappedError]
     #
     def self.from(error, parameters = nil)
       return new(

data/oni.gemspec

@@ -21,10 +21,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'kramdown'
-  gem.add_development_dependency 'ci_reporter'
-  gem.add_development_dependency 'aws-sdk'
+  gem.add_development_dependency 'aws-sdk-v1'
 end

data/spec/spec_helper.rb

@@ -5,4 +5,12 @@ require_relative '../lib/oni'
 
 RSpec.configure do |config|
   config.color = true
+
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end

data/task/jenkins.rake

@@ -1,2 +1,2 @@
 desc 'Runs all the tests for Jenkins'
-task :jenkins => ['ci:setup:rspec', 'test']
+task :jenkins => ['test']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Yorick Peterse
@@ -9,118 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: bundler
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   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
     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: kramdown
   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: ci_reporter
-  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: aws-sdk
+  name: aws-sdk-v1
   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'
 description: Framework for building concurrent daemons in Ruby.
@@ -129,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -172,17 +158,17 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Framework for building concurrent daemons in Ruby.