ligo 0.1.1 → 0.1.2

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### 0.1.2 / 2013-11-14
+
+* Add Windows support
+* Improve the accessory_mode? method for devices which expose the Google vendorId even when not in accessory mode
+
 ### 0.1.1 / 2013-04-13
 
 * Fix a major issue due to bad refactoring (get_device should return to device)

data/README.md

@@ -1,6 +1,7 @@
 <!--- coding: utf-8; fill-column: 80 --->
-# ligō
+# ![ligō](https://github.com/nibua-r/ligo-logos/raw/master/logo/ligo.png)
 
+[![Dependency Status](https://gemnasium.com/nibua-r/ligo.png)](https://gemnasium.com/nibua-r/ligo)
 [![Code Climate](https://codeclimate.com/github/nibua-r/ligo.png)](https://codeclimate.com/github/nibua-r/ligo)
 
 * [Homepage](https://github.com/nibua-r/ligo#readme)
@@ -65,7 +66,7 @@ ligō will be nothing without the
 
 At the time of writing, ligō focuses on the GNU/Linux operating system and
 YARV/MRI ruby. ligō has been developed and tested on Debian GNU/Linux with ruby
-1.9.3p327.
+1.9.3p327 and 1.9.3p429.
 
 ligō is useless without Android-side application. A
 [sample LigoTextDemo Android application](https://github.com/nibua-r/LigoTextDemo)
@@ -87,11 +88,11 @@ Or, you can install it from the github repository:
 ## Pending tasks
 
 * Write the specs and automate testing!
-* <s>Provide an Android demo application</s> → See
+* ~~Provide an Android demo application~~ → See
   [sample LigoTextDemo Android application](https://github.com/nibua-r/LigoTextDemo),
   more to come soon…
 * Improve the documentation → in progress, a first pass has been made…
-* <s>Release and push the gem to rubygems.org</s>
+* ~~Release and push the gem to rubygems.org~~
 * Finalize and publish a [celluloid](https://github.com/celluloid/celluloid)-based write-back usage
   sample (already working with the
   [sample LigoTextDemo Android application](https://github.com/nibua-r/LigoTextDemo) and the

data/Rakefile

@@ -4,17 +4,19 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'rubygems-tasks', '~> 0.2'
+  gem 'rubygems-tasks', '~> 0.2.4'
   require 'rubygems/tasks'
 
-  Gem::Tasks.new
+  Gem::Tasks.new do |tasks|
+    tasks.console.command = 'pry'
+  end
 rescue LoadError => e
   warn e.message
   warn "Run `gem install rubygems-tasks` to install Gem::Tasks."
 end
 
 begin
-  gem 'rspec', '~> 2.4'
+  gem 'rspec', '~> 2.13'
   require 'rspec/core/rake_task'
 
   RSpec::Core::RakeTask.new
@@ -28,7 +30,7 @@ task :test    => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.8'
+  gem 'yard', '~> 0.8.5.2'
   require 'yard'
 
   YARD::Rake::YardocTask.new
@@ -40,7 +42,7 @@ end
 task :doc => :yard
 
 begin
-  gem 'yardstick', '~> 0.8.0'
+  gem 'yardstick', '~> 0.9.5'
 
   require 'yardstick/rake/measurement'
 

data/bin/ligo-sample

@@ -12,7 +12,15 @@ id = {
   serial:       '3678000012345678'
 }
 
-Ligo::Logging.configure_logger_output('/tmp/ligo-sample.log')
+log_file      = 'ligo-sample.log'
+log_file_path = case Ligo.os
+                when :windows
+                  ENV['TEMP']
+                else # :unix, :linux and :macosx
+                  '/tmp'
+                end
+
+Ligo::Logging.configure_logger_output("#{log_file_path}/#{log_file}")
 ctx = Ligo::Context.new
 acc = Ligo::Accessory.new(id)
 dev = ctx.devices.first

data/lib/ligo.rb

@@ -34,4 +34,25 @@ module Ligo
   require 'ligo/accessory'
   require 'ligo/context'
   require 'ligo/device'
+
+  # Return the OS identifier
+  # @return [Symbol] one of :windows, :macosx, :linux or :unix.
+  # @raise [StandardError] if the OS is unknown.
+  def self.os
+    @os ||= (
+             host_os = RbConfig::CONFIG['host_os']
+             case host_os
+             when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+               :windows
+             when /darwin|mac os/
+               :macosx
+             when /linux/
+               :linux
+             when /solaris|bsd/
+               :unix
+             else
+               raise StandardError, "unknown os: #{host_os.inspect}"
+             end
+             )
+  end
 end

data/lib/ligo/device.rb

@@ -182,7 +182,7 @@ module Ligo
       logger.debug 'start_accessory_mode'
       sn = self.serial_number
 
-      self.open_interface(0) do |handle|
+      self.open do |handle|
         @handle = handle
         send_accessory_id
         send_start
@@ -220,7 +220,7 @@ module Ligo
     # @return [true, false] true if the {Device} is in accessory mode, false
     #   otherwise.
     def accessory_mode?
-      self.idVendor == GOOGLE_VID
+      (self.idVendor == GOOGLE_VID) && (GOOGLE_PIDS.include? self.idProduct)
     end
 
     # Check if the current {Device} supports AOAP
@@ -228,8 +228,13 @@ module Ligo
     #   otherwise.
     def aoap?
       @aoap_version = self.get_protocol
-      logger.info "#{self.inspect} supports AOAP version #{@aoap_version}."
-      @aoap_version >= 1
+      aoap_supported = (@aoap_version >= 1)
+      if aoap_supported
+        logger.info "#{self.inspect} supports AOA Protocol version #{@aoap_version}."
+      else
+        logger.info "#{self.inspect} doesn't support AOA Protocol."
+      end
+      aoap_supported
     end
 
     # Check if the current {Device} is in UMS mode
@@ -266,6 +271,8 @@ module Ligo
       end
 
       (res.size == 2 && version >= 1 ) ? version : 0
+    rescue LIBUSB::ERROR_NOT_SUPPORTED, LIBUSB::ERROR_PIPE
+      0
     end
 
     # Sends identifying string information to the device

data/lib/ligo/version.rb

@@ -17,5 +17,5 @@
 
 module Ligo
   # ligō version
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/ligo.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rspec', '~> 2.13'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2.4'
-  gem.add_development_dependency 'yard', '~> 0.8.5.2'
+  gem.add_development_dependency 'yard', '~> 0.8.7.2'
   gem.add_development_dependency 'yardstick', '~> 0.9.5'
   gem.add_development_dependency 'pry', '~> 0.9.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ligo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5.2
+        version: 0.8.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5.2
+        version: 0.8.7.2
 - !ruby/object:Gem::Dependency
   name: yardstick
   requirement: !ruby/object:Gem::Requirement