wifly 0.0.1 → 0.0.2

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 ## Usage
 Create a client by passing in the host, port, and firmware version:
 
-    control = Wifly::Control.new('192.168.1.45', 2000, '2.31.7')
+    control = Wifly::Control.new('192.168.1.45', 2000, '2.38.3')
 
 Read the high pins:
 

data/lib/wifly/connection.rb

@@ -1,7 +1,5 @@
 module Wifly
   class Connection
-    HELLO = '*HELLO*CMD\r\n'
-
     attr_accessor :address, :port, :version
   
     ##
@@ -24,10 +22,10 @@ module Wifly
     # Since the string has a predictable length, we can do a blocking read.
     #
     def send_command(str, return_len=0)
-      str += '\r'
+      str += "\r"
       socket.write(str)
-      expected_return_length = str.length + '\r\n#{prompt}'.length + return_len
-      socket.read(expected_return_length).gsub(prompt,'') 
+      expected_return_length = str.length + "\r\n#{prompt}".length + return_len
+      socket.read(expected_return_length).gsub(prompt,'')
     end
 
     def close
@@ -45,8 +43,8 @@ module Wifly
 
     def initialize_socket
       sock = Socket.tcp(address, port)
-      sock.write('$$$\r') # enter command mode 
-      sock.read(HELLO.length)       # read off the response, "*HELLO*CMD\r\n"
+      sock.write(COMMAND_MODE) # enter command mode 
+      sock.read(HELLO.length)  # read off the response
       sock
     end 
   end

data/lib/wifly/control.rb

@@ -1,7 +1,5 @@
 module Wifly
   class Control
-    AOK = "\r\nAOK"
-
     attr_accessor :connection
 
     ##

data/lib/wifly/version.rb

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

data/lib/wifly.rb

@@ -2,3 +2,9 @@ require 'socket'
 require 'wifly/connection'
 require 'wifly/control'
 require 'wifly/version'
+
+module Wifly
+  AOK          = "\r\nAOK"
+  HELLO        = "*HELLO*CMD\r\n"
+  COMMAND_MODE = "$$$\r"
+end

data/spec/connection_spec.rb

@@ -8,17 +8,17 @@ class Wifly::TestServer
 
   def simple_connect
     @client = @socket.accept
-    self.input = @client.read('$$$\r'.length) 
-    @client.write(Wifly::Connection::HELLO)
+    self.input = @client.read(Wifly::COMMAND_MODE.length) 
+    @client.write(Wifly::HELLO)
     @client.close
   end
 
   def receive_command(command, version)
     @client = @socket.accept
 
-    @client.write(Wifly::Connection::HELLO)
-    @client.read((command + '\r').length)
-    @client.write(command + '\r\r\n<' + version + '> ')
+    @client.write(Wifly::HELLO)
+    @client.read((command + "\r").length)
+    @client.write(command + "\r\r\n<" + version + '> ')
     @client.close
   end
 end
@@ -41,7 +41,7 @@ describe Wifly::Connection do
     connection = Wifly::Connection.new('localhost', 2000, '2.3.13')
     connection.socket
     t.join
-    @server.input.should eq('$$$\r')
+    @server.input.should eq(Wifly::COMMAND_MODE)
     connection.close
   end
 
@@ -53,7 +53,7 @@ describe Wifly::Connection do
 
     result = connection.send_command("lites")
     t.join
-    result.should eq('lites\r\r\n')
+    result.should eq("lites\r\r\n")
     connection.close
   end
 end

data/spec/control_spec.rb

@@ -18,8 +18,8 @@ describe Wifly::Control do
 
   it 'should set high and low' do
     connection = double('connection')
-    connection.should_receive(:send_command).with("set sys output 0x20 0x20", Wifly::Control::AOK.length)
-    connection.should_receive(:send_command).with("set sys output 0x00 0x20", Wifly::Control::AOK.length)
+    connection.should_receive(:send_command).with("set sys output 0x20 0x20", Wifly::AOK.length)
+    connection.should_receive(:send_command).with("set sys output 0x00 0x20", Wifly::AOK.length)
     control = Wifly::Control.new('localhost', 2000, '1.2', connection)
     control.set_high(5)
     control.set_low(5)

data/wifly.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wifly
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A small Ruby gem to connect to a WiFly RN-XV device
 email:
 - billy.reisinger@govdelivery.com
@@ -95,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 277051527078828641
+      hash: -937417951
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 277051527078828641
+      hash: -937417951
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25