artoo-opencv 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57bc9fbc51ba5fda0c396a2444ac3141c18d15c3
-  data.tar.gz: d4004116283a3fbfdb4d9e01a8fd29101d3d34fd
+  metadata.gz: d5774c3dbf44876bb967dd73154fa69b3f3f5e9c
+  data.tar.gz: 9bba86907a40abb1a6c7a909d4c83a8443cb6cdb
 SHA512:
-  metadata.gz: 004ad33132265e7491ff38c5d284086a61fe1f3f1373bc352bdab04d3aff9f4e3f087306b8feec6268279726a01e916707e6ce3ded64d871f3d0a77289f93d88
-  data.tar.gz: ca119a84efb97f6cdb9302944fb5b3db531f5ffb42c9937b6a5f85e6ccff85c91027b16f9af36a14093baf4fb3c9d387a491c9a5cb737214b749e5d927ad4b05
+  metadata.gz: dd3acf63cc47c2a6d29814fea985e366d1f10af0f62015826eba82fdeffe10aa8979d352210298cccd00a1973b4764bdf1cc29919f4694fcc4e446586fc59edd
+  data.tar.gz: c9cb62ea836ae96fb67190127f8754257b63221aac4f6b0f51e42025011cb4e9dbaea7a23a47a647b5d5c5fd5a7d32571dd2f4eeb750c8d2271571db2f8657b9

data/Gemfile.lock

@@ -1,50 +1,51 @@
 PATH
   remote: .
   specs:
-    artoo-opencv (0.0.1)
-      artoo (~> 1.2.0)
-      ruby-opencv (~> 0.0.10)
+    artoo-opencv (0.1.0)
+      artoo (>= 1.6.0)
+      ruby-opencv (>= 0.0.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    artoo (1.2.0)
+    artoo (1.6.0)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)
       pry (~> 0.9)
-      rake (~> 10.0)
+      rake
       reel (~> 0.4.0)
+      robeaux (~> 0.0.3)
       thor (~> 0.18.1)
-    celluloid (0.15.1)
+    celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    coderay (1.0.9)
+    coderay (1.1.0)
     http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.6.0.beta.2)
+    http_parser.rb (0.6.0)
     method_source (0.8.2)
-    multi_json (1.8.0)
-    nio4r (0.5.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    multi_json (1.8.4)
+    nio4r (1.0.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
+    rake (10.1.1)
     reel (0.4.0)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)
       http (>= 0.5.0)
       http_parser.rb (>= 0.6.0.beta.2)
       websocket_parser (>= 0.1.4)
-    ruby-opencv (0.0.10)
-    slop (3.4.6)
+    robeaux (0.0.3)
+    ruby-opencv (0.0.12)
+    slop (3.4.7)
     thor (0.18.1)
     timers (1.1.0)
-    websocket_parser (0.1.4)
-      http
+    websocket_parser (0.1.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # Artoo Adaptor For Opencv
 
-This repository contains the Artoo (http://artoo.io/) adaptor for Opencv.
+This repository contains the Artoo (http://artoo.io/) adaptor for [Opencv](http://opencv.org/).
 
 Artoo is a open source micro-framework for robotics using Ruby.
 
@@ -15,9 +15,46 @@ gem install artoo-opencv
 ## Using
 
 ```ruby
-# your example code here...
+require 'artoo'
+
+connection :capture, :adaptor => :opencv_capture
+device :capture, :driver => :opencv_capture, :connection => :capture, :interval => 0.01
+
+connection :window, :adaptor => :opencv_window
+device :window, :driver => :opencv_window, :connection => :window, :title => "Hello", :interval => 0.01
+
+work do
+  on capture, :frame => proc { |*value| 
+    window.image = value[1].image
+  }
+end
 ```
 
-## Connecting
+## Installing OpenCV
+
+If you do not already have OpenCV installed, plesase consult the artoo-opencv documentation [page](http://artoo.io/documentation/platforms/opencv/)
+
+## Documentation
+
+Check out our [documentation](http://artoo.io/documentation/) for lots of information about how to use Artoo.
+
+## IRC
+
+Need more help? Just want to say "Hello"? Come visit us on IRC freenode #artoo
+
+## Contributing
+
+* All patches must be provided under the Apache 2.0 License
+* Please use the -s option in git to "sign off" that the commit is your work and you are providing it under the Apache 2.0 License
+* Submit a Github Pull Request to the appropriate branch and ideally discuss the changes with us in IRC.
+* We will look at the patch, test it out, and give you feedback.
+* Avoid doing minor whitespace changes, renamings, etc. along with merged content. These will be done by the maintainers from time to time but they can complicate merges and should be done seperately.
+* Take care to maintain the existing coding style.
+* Add unit tests for any new or changed functionality.
+* All pull requests should be "fast forward"
+  * If there are commits after yours use “git rebase -i <new_head_branch>”
+  * If you have local changes you may need to use “git stash”
+  * For git help see [progit](http://git-scm.com/book) which is an awesome (and free) book on git
+
 
-Explain how to connect from the computer to the device here...
+(c) 2012-2014 The Hybrid Group

data/artoo-opencv.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'artoo', '~> 1.2.0'
-  s.add_runtime_dependency "ruby-opencv", "~> 0.0.10"
+  s.add_runtime_dependency 'artoo', '>= 1.6.0'
+  s.add_runtime_dependency "ruby-opencv", ">= 0.0.12"
   # s.add_development_dependency 'minitest', '~> 5.0'
   # s.add_development_dependency 'minitest-happy'
   # s.add_development_dependency 'mocha', '~> 0.14.0'

data/examples/ardrone_face_tracking.rb

@@ -3,8 +3,8 @@ require 'artoo'
 connection :capture, :adaptor => :opencv_capture, :source => "tcp://192.168.1.1:5555"
 device :capture, :driver => :opencv_capture, :connection => :capture, :interval => 0.0033
 
-connection :video, :adaptor => :opencv_window, :title => "Video"
-device :video, :driver => :opencv_window, :connection => :video, :interval => 0.0033
+connection :video, :adaptor => :opencv_window
+device :video, :driver => :opencv_window, :connection => :video, :title => "Video", :interval => 0.0033
 
 connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
 device :drone, :driver => :ardrone, :connection => :ardrone

data/examples/ardrone_tracking.rb

@@ -3,8 +3,8 @@ require 'artoo'
 connection :capture, :adaptor => :opencv_capture, :source => "tcp://192.168.1.1:5555"
 device :capture, :driver => :opencv_capture, :connection => :capture, :interval => 0.025
 
-connection :video, :adaptor => :opencv_window, :title => "Video"
-device :video, :driver => :opencv_window, :connection => :video, :interval => 0.025
+connection :video, :adaptor => :opencv_window
+device :video, :driver => :opencv_window, :connection => :video, :title => "Video", :interval => 0.025
 
 connection :ardrone, :adaptor => :ardrone, :port => '192.168.1.1:5556'
 device :drone, :driver => :ardrone, :connection => :ardrone

data/examples/ball_tracking.rb

@@ -3,8 +3,8 @@ require 'artoo'
 connection :capture, :adaptor => :opencv_capture
 device :capture, :driver => :opencv_capture, :connection => :capture, :interval => 0.01
 
-connection :video, :adaptor => :opencv_window, :title => "Video"
-device :video, :driver => :opencv_window, :connection => :video, :interval => 0.01
+connection :video, :adaptor => :opencv_window
+device :video, :driver => :opencv_window, :connection => :video, :title => "Video", :interval => 0.01
 
 work do
   on capture, :frame => proc { |*value| 

data/examples/capture.rb

@@ -3,11 +3,11 @@ require 'artoo'
 connection :capture, :adaptor => :opencv_capture
 device :capture, :driver => :opencv_capture, :connection => :capture, :interval => 0.01
 
-connection :window, :adaptor => :opencv_window, :title => "My Window"
-device :window, :driver => :opencv_window, :connection => :window, :interval => 0.01
+connection :window, :adaptor => :opencv_window
+device :window, :driver => :opencv_window, :connection => :window, :title => "My Window", :interval => 0.01
 
 work do
   on capture, :frame => proc { |*value| 
-    window.image = value[1]
+    window.image = value[1].image
   }
 end

data/examples/face_detect.rb

@@ -3,8 +3,8 @@ require 'artoo'
 connection :capture, :adaptor => :opencv_capture
 device :capture, :driver => :opencv_capture, :connection => :capture, :interval => 0.01
 
-connection :video, :adaptor => :opencv_window, :title => "Video"
-device :video, :driver => :opencv_window, :connection => :video, :interval => 0.01
+connection :video, :adaptor => :opencv_window
+device :video, :driver => :opencv_window, :connection => :video, :title => "Video", :interval => 0.01
 
 work do
   haar = "#{Dir.pwd}/examples/haarcascade_frontalface_alt.xml"

data/lib/artoo-opencv/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   module Opencv
-    VERSION = '0.0.1'
+    VERSION = '0.1.0'
   end
 end

data/lib/artoo/adaptors/opencv.rb

@@ -5,15 +5,8 @@ module Artoo
     # Connect to a opencv device
     # @see device documentation for more information
     class Opencv < Adaptor
-      finalizer :finalize
       attr_reader :device
 
-      # Closes connection with device if connected
-      # @return [Boolean]
-      def finalize
-        disconnect if connected?
-      end
-
       # Creates a connection with device
       # @return [Boolean]
       def connect

data/lib/artoo/drivers/opencv_window.rb

@@ -12,7 +12,7 @@ module Artoo
       def initialize(params={})
         super
         title = additional_params[:title] || ""
-        @window = ::OpenCV::GUI::Window.new(title)
+        @window = ::OpenCV::GUI::Window.new(title,2)
       end
 
       # Start driver and any required connections
@@ -29,7 +29,6 @@ module Artoo
         end
       end
 
-
       def show_image
         begin
           window.show @image if !@image.nil?

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: artoo-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Adrian Zankich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artoo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
 description: Artoo adaptor and driver for Opencv
 email:
 - artoo@hybridgroup.com
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: artoo-opencv
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Artoo adaptor and driver for Opencv