gpio 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,6 @@
 gpio
 ====
 
-gpio allows for devices such as raspberry pi or systems with 1wire usb adapters to speak to the system's input/output pins. The end goal is for people to contribute code for specific devices, sensors and outputs.
+gpio ruby gem allows for ruby code running on devices such as raspberry pi or systems with 1wire usb adapters to speak to the system's input/output pins.
+
+the end goal is for people to contribute code for specific devices, sensors and outputs.

data/changelog

@@ -1,2 +1,8 @@
+version 0.0.2
+- device/rasberrypi now modules instead of class
+- pin.new(params) now pass hash of params to pin.new {pin: 1, mode: :in, device: :RaspberryPi}
+- pin.new now has default if no device is passed in
+- lib files now load properly
+
 version 0.0.1: initial public release
 - proof of concept / prototype

data/lib/gpio/device.rb

@@ -1,19 +1,17 @@
 module GPIO
-	class Device
-		attr_reader :mapping, :hardware_pins, :software_pins
-
-		def software_pin(pin)
+	module Device
+		def self.software_pin(pin)
 			raise "That software pin doesn't exist." unless software.include? pin
 			mapping == :software ? pin : software[hardware.index(pin)]
 		end
-		def hardware_pin(pin)
+		def self.hardware_pin(pin)
 			raise "That hardware pin doesn't exist." unless hardware.include? pin
 			mapping == :hardware ? pin : hardware[software.index(pin)]
 		end
-		def load_pins
+		def self.load_pins
 			get_pins(:hardware).map{|pin| Pin.new(pin,get_direction(pin),self)}
 		end
-		def unexport_all!
+		def self.unexport_all!
 			load_pins.map(&unexport!)
 		end
 	end

data/lib/gpio/pin.rb

@@ -1,17 +1,17 @@
 module GPIO
 	class Pin
-		attr_reader :hardware_pin, :software_pin, :pin, :direction, :device
-		def initialize(pin, direction, device)
-			@device = device
+		attr_reader :pin, :mode, :device, :hardware_pin, :software_pin
+		def initialize(params) #(pin, mode, device=:RaspberryPi)
+			@device = GPIO.const_get(params[:device]||:RaspberryPi)
 
+			@pin = params[:pin].to_int
 			@hardware_pin = device.hardware_pin(pin)
 			@software_pin = device.software_pin(pin)
-			@pin = device.mapping ? software : hardware
 
-			@direction = direction.to_s || get_direction
-			raise "Direction should be :in, :out." unless ['in','out'].include? @direction
+			@mode = params[:mode].to_s || device.get_direction
+			raise "Mode should be :in, :out, :bi, :pwm." unless ['in','out'].include? @mode
 
-			device.initialize_pin(software_pin, @direction)
+			device.initialize_pin(software_pin, @mode)
 		end
 
 		def on
@@ -23,7 +23,7 @@ module GPIO
 			read
 		end
 		def read
-			device.read(pin)
+			device.read(software_pin)
 		end
 	end
 end

data/lib/gpio/raspberry_pi.rb

@@ -1,44 +1,62 @@
 module GPIO
-	class RaspberryPi < Device
-		def initialize(mapping=:hardware)
-			@mapping = mapping
-			raise "mapping must either be :hardware or :software" unless [:hardware,:software].include? mapping
-			@hardware_pins = [3,5,7,8,10,11,12,13,15,16,17,19,21,22,23,24,26]
-			@software_pins = [0,1,4,14,15,17,18,21,22,23,24,10,9,25,11,8,7]
+	module RaspberryPi
+		def self.mapping
+			:hardware
+		end
+		def self.hardware_pins
+			[3,5,7,8,10,11,12,13,15,16,17,19,21,22,23,24,26]
+		end
+		def self.software_pins
+			[0,1,4,14,15,17,18,21,22,23,24,10,9,25,11,8,7]
 		end
 
-		def get_pins(mapping=@mapping)
+		def self.get_pins(mapping=@mapping)
 			pins = `sudo ls /sys/class/gpio`.scan(/(?:gpio)(\d+)/).flatten.map!(&:to_i)
 			pins.map!{|pin| Pin.new(pin,nil,self).pin}
 		end
-		def get_direction(software_pin)
+		def self.get_direction(software_pin)
 			`sudo cat /sys/class/gpio/gpio#{software_pin}/direction`.chomp
 		end
 
-		def initialize_pin(software_pin, direction)
+		def self.initialize_pin(software_pin, direction)
 			unexport!(software_pin) if exported?(software_pin) && direction != get_direction(software_pin)
-			export!(software_pin) unless exported?(software_pin)
+			export!(software_pin, direction) unless exported?(software_pin)
 		end
 
-		def exported?(software_pin)
+		def self.exported?(software_pin)
 			`sudo [ -d /sys/class/gpio/gpio#{software_pin} ] && echo true || false`.chomp == 'true'
 		end
-		def export!(software_pin,direction)
+		def self.export!(software_pin,direction)
 			`sudo bash -c "echo #{software_pin} > /sys/class/gpio/export"`
 			`sudo bash -c "echo #{direction} > /sys/class/gpio/gpio#{software_pin}/direction"`
 			exported?(software_pin)
 		end
-		def unexport!(software_pin)
+		def self.unexport!(software_pin)
 			`sudo bash -c "echo #{software_pin} > /sys/class/gpio/unexport"`
 			!exported?(software_pin)
 		end
 
-		def read(software_pin)
+		def self.read(software_pin)
 			`sudo cat /sys/class/gpio/gpio#{software_pin}/value`.chomp == '1'
 		end
-		def write(software_pin,value)
+		def self.write(software_pin,value)
 			raise "This pin is an input." if get_direction(software_pin) == 'in'
 			`sudo bash -c "echo #{value} > /sys/class/gpio/gpio#{software_pin}/value && echo true || false"`.chomp == 'true'
 		end
+
+		def self.software_pin(pin)
+			raise "That software pin doesn't exist." unless software_pins.include? pin
+			mapping == :software ? pin : software_pins[hardware_pins.index(pin)]
+		end
+		def self.hardware_pin(pin)
+			raise "That hardware pin doesn't exist." unless hardware_pins.include? pin
+			mapping == :hardware ? pin : hardware_pins[software_pins.index(pin)]
+		end
+		def self.load_pins
+			get_pins(:hardware).map{|pin| Pin.new(pin,get_direction(pin),self)}
+		end
+		def self.unexport_all!
+			load_pins.map(&unexport!)
+		end
 	end
 end

metadata

@@ -1,53 +1,67 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gpio
-version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Christopher Klapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+
+date: 2012-06-05 00:00:00 -04:00
+default_executable: 
 dependencies: []
-description: gpio allows for devices such as raspberry pi or systems with 1wire usb
-  adapters to speak to the system's input/output pins. The end goal is for people
-  to contribute code for specific devices, sensors and outputs.
+
+description: gpio allows for devices such as raspberry pi or systems with 1wire usb adapters to speak to the system's input/output pins. The end goal is for people to contribute code for specific devices, sensors and outputs.
 email: christopher@klapp.name
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/gpio/device.rb
 - lib/gpio/pin.rb
 - lib/gpio/raspberry_pi.rb
 - lib/gpio.rb
 - README.md
 - changelog
+has_rdoc: true
 homepage: http://klappy.github.com/gpio
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: gpio allows for devices such as raspberry pi or systems with 1wire usb adapters
-  to speak to the system's input/output pins.
+summary: gpio allows for devices such as raspberry pi or systems with 1wire usb adapters to speak to the system's input/output pins.
 test_files: []
+