hwping 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b5f7585b1225c1e90d2a487c2d5f530c272d64
-  data.tar.gz: d205c225b205e58a8b38f9a51b504a4c32d9e9eb
+  metadata.gz: c18dfab7c8e9e20c071cc51f6a36f6d0e2c21c04
+  data.tar.gz: 08c791adf1bd917fc072b880c28b4d24d7d65ddf
 SHA512:
-  metadata.gz: 6ccd7294ada3df2970c0f203b0968ec47f1e6808dce9d50e8ca60f0eef577d8ea6eef302d4f1e0cd3abaccb78da7d09e8a6ddc896afff95db030d20f42debd95
-  data.tar.gz: e1cd1ad3cf79e525d3d6804144d252edf0c6c5f41aaf80961739dd668c9341e05b524df3a72ef061c71cbae4cdac5e34d1b97202b67711171088e7baa371abce
+  metadata.gz: 1d0d79a4f4dfef09e164812079e186828d2e70f16f29a147e0a76991b83649e32b59eecee8cc8ba0122c5f93dae3401a3e67ac3866bf04b33f79abbb7110b9b1
+  data.tar.gz: 6c8c25675325b49a02dd98be552241fbbdc060a633aeaf2f22c1b290690205b14aeae3777a11c5caf875e9536330f4a1349c072b003bd7e8a26f8da5ad4cca20

data/bin/hwping

@@ -10,7 +10,7 @@ OptionParser.new do |opts|
   opts.version = HWPing::VERSION
   opts.program_name = HWPing::APP_NAME
   opts.banner = 'Usage: hwping [options]'
-  opts.on('-c', '--config-file file.yml', "Specify which configuration file you want to use instead of the default config.yml") do |v|
+  opts.on('-c', '--config-file file.yml', 'Specify which configuration file you want to use instead of the default config.yml') do |v|
     options[:config] = v
   end
 end.parse!
@@ -19,14 +19,16 @@ end.parse!
 file = options.fetch(:config, HWPing::CONFIG_FILE)
 config = YAML.load_file(file)
 
-# Run the application
+# Initialize the application
 app = HWPing::HWPing.new(config)
-app.start
 
 # Stop the bot and save the configuration file
 at_exit do
-  app.stop
   File.open(file, 'w') do |f|
-    YAML.dump(app.config, f)
+    f.write(YAML.dump(app.config))
   end
-end
+  app.stop
+end
+
+# Run the application
+app.start

data/lib/hwping/bot.rb

@@ -2,7 +2,6 @@ require 'cinch'
 
 module HWPing
   class Bot
-
     MESSAGES = {
       :unauthorized => "Sorry, you're unauthorized to use this bot!",
       :firing       => 'Firing rocket in 5 seconds!',
@@ -28,16 +27,16 @@ module HWPing
           target set <nick> <right> <up>\n
           target get <nick>\n
           target del <nick>\n"
-    }
+    }.freeze
 
     # Initialize a bot and return with its Cinch instance
     def initialize(handler, config = {})
-      @bot = Cinch::Bot.new do |b|
+      @bot = Cinch::Bot.new do
         configure do |c|
           c.nick     = config.nick
           c.server   = config.server
           c.port     = config.port
-          c.channels = config.channels.map { |m| "\##{m}"}
+          c.channels = config.channels.map { |m| "\##{m}" }
         end
 
         # For channel mesages, just reply with the matching message
@@ -64,4 +63,4 @@ module HWPing
       @bot.quit
     end
   end
-end
+end

data/lib/hwping/config.rb

@@ -1,24 +1,23 @@
 module HWPing
   class Config
-
-    attr_reader   :server
-    attr_reader   :port
-    attr_reader   :nick
-    attr_reader   :channels
-    attr_reader   :auth
+    attr_reader :server
+    attr_reader :port
+    attr_reader :nick
+    attr_reader :channels
+    attr_reader :auth
     attr_accessor :targets
 
     def initialize(hash = {})
-      @server   = hash.fetch('server',   'irc.freenode.net')
-      @port     = hash.fetch('port',     6667)
-      @nick     = hash.fetch('nick',     'hwping')
-      @channels = hash.fetch('channels', ['hwping-test'])
-      @auth     = hash.fetch('auth'    , [])
-      @targets  = hash.fetch('targets',  [])
+      @server   = hash.fetch('server', 'irc.freenode.net')
+      @port     = hash.fetch('port', 6667)
+      @nick     = hash.fetch('nick', 'hwping')
+      @channels = Array(hash.fetch('channels', ['hwping-test']))
+      @auth     = Array(hash.fetch('auth', []))
+      @targets  = hash.fetch('targets', {}).to_h
     end
 
     def to_hash
       Hash[instance_variables.map { |name| [name[1..-1], instance_variable_get(name)] }]
     end
   end
-end
+end

data/lib/hwping/constants.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module HWPing
-  VERSION = '0.1'
-  APP_NAME = 'hwping'
-  REPO_URL = 'http://github.com/skateman/hwping'
-  CONFIG_FILE = 'config.yml'
-end
+  VERSION = '0.2'.freeze
+  APP_NAME = 'hwping'.freeze
+  REPO_URL = 'http://github.com/skateman/hwping'.freeze
+  CONFIG_FILE = 'config.yml'.freeze
+end

data/lib/hwping/handler.rb

@@ -11,9 +11,9 @@ module HWPing
     # If the event happened in a channel, return just with a symbol
     def channel(event)
       if event.message =~ /^hwping,?\s+(.*)\s*$/
-        if @auth.include?(event.user.to_s)
-          if @targets.include?($1)
-            @launcher.point_and_fire(@targets[$1])
+        if authorized?(event.user.to_s)
+          if @targets.include?(Regexp.last_match(1))
+            @launcher.point_and_fire(@targets[Regexp.last_match(1)])
             return :firing
           else
             return :notarget
@@ -26,26 +26,32 @@ module HWPing
 
     # If the event happened in a private window, return with an array
     def private(event)
-      if @auth.include?(event.user.to_s)
+      if authorized?(event.user.to_s)
         case event.message
-        when "fire"
+        when 'fire'
           @launcher.fire
           return [:fire]
-        when "position"
+        when 'position'
           return @launcher.position.unshift(:position)
-        when "help"
+        when 'help'
           return [:help]
-        when "reset"
+        when 'reset'
           @launcher.reset
           return [:reset]
-        when "target list"
+        when 'target list'
           return [:target_list, @targets.keys.join(', ')]
         when /^target set ([^\s]+)( (\d+) (\d+))?$/
-          @targets[$1] = $2 ? [$3.to_i, $4.to_i] : @launcher.position
-          return [:target_set, @targets[$1]].flatten
+          @targets[Regexp.last_match(1)] = begin
+            if Regexp.last_match(2)
+              [Regexp.last_match(3).to_i, Regexp.last_match(4).to_i]
+            else
+              @launcher.position
+            end
+          end
+          return [:target_set, @targets[Regexp.last_match(1)]].flatten
         when /^target ((get)|(del)) ([^\s]+)$/
-          if @targets.has_key?($+)
-            if $1 == "del"
+          if @targets.key?($+)
+            if Regexp.last_match(1) == 'del'
               @targets.delete($+)
               return [:target_del]
             else
@@ -55,7 +61,7 @@ module HWPing
             return [:notarget]
           end
         when /^((up)|(down)|(left)|(right)) (\d+)$/
-          @launcher.send($1, $+.to_i)
+          @launcher.send(Regexp.last_match(1), $+.to_i)
           return [:move]
         else
           return [:badcommand]
@@ -64,5 +70,14 @@ module HWPing
         return [:unauthorized]
       end
     end
+
+    private
+
+    def authorized?(nick)
+      @auth.each do |user|
+        return true if user =~ /^#{nick}(?:\b?|\S?)/
+      end
+      false
+    end
   end
-end
+end

data/lib/hwping/hwping.rb

@@ -1,11 +1,10 @@
 module HWPing
   class HWPing
-
     attr_reader :bot
 
     def initialize(config = {})
       @config = Config.new(config)
-      @launcher = Launcher.connect()
+      @launcher = Launcher.connect
       @handler = Handler.new(@launcher, @config)
       @bot = Bot.new(@handler, @config)
     end

data/lib/hwping/launcher.rb

@@ -3,13 +3,12 @@ require 'libusb'
 
 module HWPing
   class Launcher
-
     DeviceNotFoundError = Class.new(IOError)
 
     DEVICE = {
       :vendor_id  => 0x2123,
       :product_id => 0x1010
-    }
+    }.freeze
 
     COMMANDS = {
       :down  => 0x01,
@@ -20,12 +19,12 @@ module HWPing
       :stop  => 0x20,
       :on    => 0x01,
       :off   => 0x00
-    }
+    }.freeze
 
     TARGETS = {
       :launcher => 0x02,
       :led      => 0x03
-    }
+    }.freeze
 
     REQUEST_TYPE  = 0x21
     REQUEST       = 0x09
@@ -38,7 +37,7 @@ module HWPing
         :idProduct => DEVICE[:product_id]
       ).first
 
-      raise DeviceNotFoundError, 'Launcher was not found.' if launcher.nil?
+      fail DeviceNotFoundError, 'Launcher was not found.' if launcher.nil?
       new(launcher)
     end
 
@@ -99,18 +98,19 @@ module HWPing
       update_pos direction, duration
     end
 
-  private
+    private
+
     # Send data through USB
     def send!(target, command)
       payload = build_payload(target, COMMANDS[command.to_sym])
 
       @handle.control_transfer(
-        bmRequestType: REQUEST_TYPE,
-        bRequest: REQUEST,
-        wValue: 0,
-        wIndex: 0,
-        dataOut: payload,
-        timeout: 0
+        :bmRequestType => REQUEST_TYPE,
+        :bRequest      => REQUEST,
+        :wValue        => 0,
+        :wIndex        => 0,
+        :dataOut       => payload,
+        :timeout       => 0
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hwping
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Dávid Halász
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -16,56 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.37.2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.2
 description: IRC bot for HW pinging with the Dream Cheeky Thunder missile launcher
 email: skateman@skateman.eu
 executables:
@@ -73,14 +115,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hwping/handler.rb
-- lib/hwping/launcher.rb
-- lib/hwping/hwping.rb
+- bin/hwping
+- lib/hwping.rb
 - lib/hwping/bot.rb
 - lib/hwping/config.rb
 - lib/hwping/constants.rb
-- lib/hwping.rb
-- bin/hwping
+- lib/hwping/handler.rb
+- lib/hwping/hwping.rb
+- lib/hwping/launcher.rb
 homepage: http://github.com/skateman/hwping
 licenses:
 - GPL-2
@@ -101,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hardware Pinger