From ceda92172bc1efdcc2d03150c29bea103ef41ee7 Mon Sep 17 00:00:00 2001 From: deadprogram Date: Thu, 6 Feb 2014 16:34:44 -0800 Subject: [PATCH] Update to 1.4.0 --- Gemfile.lock | 37 ++++++++++++++++++------------------ LICENSE | 2 +- README.md | 27 +++++++++++++++++++++----- artoo-arduino.gemspec | 4 ++-- lib/artoo-arduino/version.rb | 2 +- 5 files changed, 45 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 56b21b9..0ac6167 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,38 @@ PATH remote: . specs: - artoo-arduino (1.3.0) - artoo (>= 1.4.0) + artoo-arduino (1.4.0) + artoo (>= 1.6.0) artoo-gpio artoo-i2c - hybridgroup-firmata (~> 0.4.5) + hybridgroup-firmata (>= 0.4.5) GEM remote: http://rubygems.org/ specs: - artoo (1.4.1) + artoo (1.6.0) celluloid (~> 0.15.0) celluloid-io (~> 0.15.0) multi_json (~> 1.6) pry (~> 0.9) rake reel (~> 0.4.0) + robeaux (~> 0.0.3) thor (~> 0.18.1) - artoo-gpio (0.2.1) - artoo (>= 1.2.2) - artoo-i2c (0.3.0) - artoo (>= 1.3.0) + artoo-gpio (0.4.0) + artoo (>= 1.6.0) + artoo-i2c (0.5.0) + artoo (>= 1.6.0) 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) event_emitter (0.2.5) http (0.5.0) http_parser.rb - http_parser.rb (0.6.0.beta.2) + http_parser.rb (0.6.0) hybridgroup-firmata (0.4.5) event_emitter metaclass (0.0.1) @@ -40,24 +41,24 @@ GEM minitest-happy (1.0.0) mocha (0.14.0) metaclass (~> 0.0.1) - multi_json (1.8.2) - 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) - slop (3.4.6) + robeaux (0.0.3) + 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 diff --git a/LICENSE b/LICENSE index a8adf0e..f1e696b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012, 2013 The Hybrid Group +Copyright (c) 2012-2014 The Hybrid Group Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index b6e718b..999ae69 100644 --- a/README.md +++ b/README.md @@ -142,10 +142,27 @@ artoo connect serial ttyACM0 4567 We are currently working with the Celluloid team to add Windows support. Please check back soon! +## 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 -1. Fork it -2. Create your feature branch (`git checkout -b my-new-feature`) -3. Commit your changes (`git commit -am 'Add some feature'`) -4. Push to the branch (`git push origin my-new-feature`) -5. Create new Pull Request +* 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 ” + * 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 + + +(c) 2012-2014 The Hybrid Group diff --git a/artoo-arduino.gemspec b/artoo-arduino.gemspec index 5cfaaa3..2d9e566 100644 --- a/artoo-arduino.gemspec +++ b/artoo-arduino.gemspec @@ -21,10 +21,10 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.extensions = ["ext/Rakefile"] - s.add_runtime_dependency 'artoo', '>= 1.4.0' + s.add_runtime_dependency 'artoo', '>= 1.6.0' s.add_runtime_dependency 'artoo-gpio' s.add_runtime_dependency 'artoo-i2c' - s.add_runtime_dependency 'hybridgroup-firmata', '~> 0.4.5' + s.add_runtime_dependency 'hybridgroup-firmata', '>= 0.4.5' s.add_development_dependency 'minitest', '~> 5.0' s.add_development_dependency 'minitest-happy' s.add_development_dependency 'mocha', '~> 0.14.0' diff --git a/lib/artoo-arduino/version.rb b/lib/artoo-arduino/version.rb index e7e43f1..d84e066 100644 --- a/lib/artoo-arduino/version.rb +++ b/lib/artoo-arduino/version.rb @@ -1,5 +1,5 @@ module Artoo module Arduino - VERSION = '1.3.0' + VERSION = '1.4.0' end end