adafruit-servo-driver 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84f2cc7a69153a8eede4660e1437ca7ddd7b67ca
-  data.tar.gz: d4bfa9b88a0334c46373ea1249948fdcc9d2e431
+  metadata.gz: 6f74b96f6805c6533645bb75ac04113d8aafe27f
+  data.tar.gz: 1d4b2532f6b03812ed5a304fae226a0b857e3feb
 SHA512:
-  metadata.gz: c07a7084e686daaa3159127b23223055e4a6b3b6c444d124f9d0d471dee4872024a773980c4c53df7c34f2e62d591683517e19df996157ddc9c7526e1c0a145d
-  data.tar.gz: c00d8858116ee94af5cf8af14245c26503f3d444dadb573cc1c4a2ceaac5d6702da060569fd0e0480ac8d87e7fd65dc8abd41a630d9edbac2535477b82cd8c23
+  metadata.gz: 6aae41cd0482e3716c9494095e83a4272b77c861cd1b2f55c958b320b4377a0c799c5262faf2a604639297014c13b3ebb2e289bd954782bb3618d640ecb8499f
+  data.tar.gz: ee66e655f45e7bad754ad0c4954c960baece4763987f32fcb03ddcf67b64bbaf63c1b389536f01ac3c131196f37e193182ffa8b4db4eabd12f1b852ab7b4e3c8

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.0.2 (2015-01-16)
+
+  - Update to work with rev 1 or 2 Raspberry Pi

data/README.md

@@ -17,14 +17,14 @@ gem install adafruit-servo-driver
 require 'adafruit-servo-driver'
 
 pwm = PWM.new(0x40, true)
-pwm.setPWMFreq(50)
+pwm.set_pwm_freq(50)
 
 channel = 0
 
 3.times do
-  pwm.setPWM(channel, 0, 212)
+  pwm.set_pwm(channel, 0, 212)
   sleep(0.5)
-  pwm.setPWM(channel, 0, 412)
+  pwm.set_pwm(channel, 0, 412)
   sleep(0.5)
 end
 ```

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task default: %w[spec]

data/adafruit-servo-driver.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
 end

data/lib/adafruit-servo-driver.rb

@@ -5,3 +5,4 @@ end
 
 require 'adafruit-servo-driver/version'
 require 'adafruit-servo-driver/pwm'
+require 'adafruit-servo-driver/i2c_device'

data/lib/adafruit-servo-driver/i2c_device.rb

@@ -0,0 +1,23 @@
+module AdafruitServoDriver
+  class I2CDevice
+    DEVICES = [
+      '/dev/i2c-0', # Raspberry Pi rev 1
+      '/dev/i2c-1', # Raspberry Pi rev 2
+    ]
+
+    class << self
+      def detect
+        DEVICES.find(if_not_found) do |device_path|
+          File.exist? device_path
+        end
+      end
+
+      def if_not_found
+        -> { raise DeviceNotFoundError.new }
+      end
+    end
+  end
+
+  class DeviceNotFoundError < StandardError
+  end
+end

data/lib/adafruit-servo-driver/pwm.rb

@@ -1,4 +1,5 @@
 require 'i2c/i2c'
+include AdafruitServoDriver
 
 class PWM
   # Registers
@@ -25,9 +26,8 @@ class PWM
   OUTDRV             = 0x04
 
   def initialize(address=0x40, debug=false)
-    # TODO detect pi revision
     @address = address
-    @i2c = I2C.create('/dev/i2c-1')
+    @i2c = I2C.create(I2CDevice.detect)
     @debug = debug
     puts 'Reseting PCA9685 MODE1 (without SLEEP) and MODE2' if @debug
     setAllPWM(0, 0)

data/lib/adafruit-servo-driver/version.rb

@@ -1,3 +1,3 @@
 module AdafruitServoDriver
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/i2c_device_spec.rb

@@ -0,0 +1,35 @@
+include AdafruitServoDriver
+
+describe I2CDevice do
+  context 'A Raspberry Pi rev 1' do
+    before do
+      allow(File).to receive('exist?').with('/dev/i2c-0').and_return true
+    end
+
+    it 'detects the device path' do
+      expect(I2CDevice.detect).to eq '/dev/i2c-0'
+    end
+  end
+
+  context 'A Raspberry Pi rev 2' do
+    before do
+      allow(File).to receive('exist?').with('/dev/i2c-0').and_return false
+      allow(File).to receive('exist?').with('/dev/i2c-1').and_return true
+    end
+
+    it 'detects the device path' do
+      expect(I2CDevice.detect).to eq '/dev/i2c-1'
+    end
+  end
+
+  context 'an unknown device' do
+    before do
+      allow(File).to receive('exist?').with('/dev/i2c-0').and_return false
+      allow(File).to receive('exist?').with('/dev/i2c-1').and_return false
+    end
+
+    it 'raises a DeviceNotFoundError' do
+      expect{I2CDevice.detect}.to raise_error DeviceNotFoundError
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,75 @@
+require_relative '../lib/adafruit-servo-driver'
+
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adafruit-servo-driver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris D'Ambrosio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i2c
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: A Ruby implementation of Adafruit's Python library for the Adafruit PCA9685
   16-Channel PWM Servo Driver for use with the Raspberry Pi.
 email:
@@ -61,15 +75,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - adafruit-servo-driver.gemspec
-- example.rb
 - lib/adafruit-servo-driver.rb
+- lib/adafruit-servo-driver/i2c_device.rb
 - lib/adafruit-servo-driver/pwm.rb
 - lib/adafruit-servo-driver/version.rb
+- spec/i2c_device_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -94,4 +112,6 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby i2c interface for the Adafruit PCA9685 Servo Driver and Raspberry Pi
-test_files: []
+test_files:
+- spec/i2c_device_spec.rb
+- spec/spec_helper.rb

data/example.rb

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# adapted from http://www.raspberrypi.org/phpBB3/viewtopic.php?t=32826
-
-require File.dirname(__FILE__) + '/adafruit-pwm-servo-driver'
-
-pwm = PWM.new(0x40, true)
-pwm.setPWMFreq(50)
-
-channel = 0
-
-3.times do
-  pwm.setPWM(channel, 0, 212)
-  sleep(0.5)
-  pwm.setPWM(channel, 0, 412)
-  sleep(0.5)
-end