diff --git a/Gemfile b/Gemfile index 3e25c3c0d072f6ea4eaeaba1bdb46aef304ed943..1b10e5cd059703207a6e335e47fafed875d43473 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -# Specify your gem's dependencies in apex.gemspec +# Specify your gem's dependencies in aprs.gemspec gemspec diff --git a/README.md b/README.md index a293628288abce720f39be0af3e669010668105f..c19343a4538337e8b53b04d125efa06b52b6af83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Apex +# APRS Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/apex`. To experiment with that code, run `bin/console` for an interactive prompt. @@ -9,7 +9,7 @@ TODO: Delete this and the text above, and describe your gem Add this line to your application's Gemfile: ```ruby -gem 'apex' +gem 'aprs' ``` And then execute: @@ -18,7 +18,7 @@ And then execute: Or install it yourself as: - $ gem install apex + $ gem install aprs ## Usage @@ -32,5 +32,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To ## Contributing -Bug reports and pull requests are welcome on GitHub at https://github.com/Syncleus/apex-ruby. +Bug reports and pull requests are welcome on GitHub at https://github.com/Syncleus/aprs diff --git a/README.rdoc b/README.rdoc index 454794037d597a8efa70251f8b9c6995ca5f1b56..0a09a724a0af7f58f1623e20005cf64d19ac074f 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,14 +1,14 @@ = apex - DESCRIBE YOUR GEM -Author:: YOUR NAME (YOUR EMAIL) -Copyright:: Copyright (c) 2016 YOUR NAME +Author:: Jeffrey Phillips Freeman (freemo@gmail.com) +Copyright:: Copyright (c) 2016 Syncleus DESCRIBE YOUR GEM HERE == Links -* {Source on Github}[LINK TO GITHUB] +* {Source on Github}[https://github.com/Syncleus/aprs] * RDoc[LINK TO RDOC.INFO] == Install diff --git a/apex.gemspec b/apex.gemspec index 1757dec8790f4c3726b143ba49cc195083bc419a..79889ae0c3dca44990ac2816fa49cec84d424327 100644 --- a/apex.gemspec +++ b/apex.gemspec @@ -1,17 +1,17 @@ # coding: utf-8 lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'apex/app_info' +require 'aprs/app_info' Gem::Specification.new do |spec| - spec.name = 'apex' - spec.version = Apex::VERSION + spec.name = 'aprs' + spec.version = Aprs::VERSION spec.authors = ['Jeffrey Phillips Freeman'] spec.email = ['jeffrey.freeman@syncleus.com'] - spec.summary = %q{Reference implementation for the APEX Radio protocol.} - spec.description = %q{Reference implementation for the APEX Radio protocol.} - spec.homepage = 'http://apexprotocol.com' + spec.summary = %q{Ruby library for APRS communications.} + spec.description = %q{Ruby library for APRS communications.} + spec.homepage = 'https://github.com/Syncleus/aprs' # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host' # to allow pushing to a single host or delete this section to allow pushing to any host. @@ -31,8 +31,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'colorize' spec.add_dependency 'abstraction' spec.add_dependency 'json' - spec.add_dependency 'serialport' - spec.add_dependency 'methadone' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake' spec.add_development_dependency 'rdoc' diff --git a/bin/apex b/bin/apex deleted file mode 100755 index 0930b96d5305262cbba654586170dee8ba467476..0000000000000000000000000000000000000000 --- a/bin/apex +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env ruby - -require 'optparse' -require 'methadone' -require_relative '../lib/apex' - -class App - include Methadone::Main - include Methadone::CLILogging - - main do |needed, maybe| - puts options[:switch] - puts options[:flag] - Apex::main - end - - description "APEX reference implementation for the APEX protocol." - version Apex::VERSION - - # Proxy to an OptionParser instance's on method - on("--[no]-switch", "Toggles the switch") - on("--flag VALUE", "Sets the flag.") - - arg :needed - arg :maybe, :optional - - defaults_from_env_var 'SOME_VAR' - defaults_from_config_file '.apex.rc' - - use_log_level_option :toggle_debug_on_signal => 'USR1' - - go! -end diff --git a/bin/console b/bin/console deleted file mode 100755 index 9ee6209a57a1dcca0ed36d783d2f2172863367ba..0000000000000000000000000000000000000000 --- a/bin/console +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env ruby - -require "bundler/setup" -require "apex" - -# You can add fixtures and/or initialization code here to make experimenting -# with your gem easier. You can also use a different console, if you like. - -# (If you use this, don't forget to add pry to your Gemfile!) -# require "pry" -# Pry.start - -require "irb" -IRB.start diff --git a/bin/setup b/bin/setup deleted file mode 100755 index dce67d860af47a4eb630117ce03624bae45dcf26..0000000000000000000000000000000000000000 --- a/bin/setup +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -IFS=$'\n\t' -set -vx - -bundle install - -# Do any other automated setup that you need to do here diff --git a/features/step_definitions/apex_steps.rb b/features/step_definitions/aprs_steps.rb similarity index 100% rename from features/step_definitions/apex_steps.rb rename to features/step_definitions/aprs_steps.rb diff --git a/features/support/env.rb b/features/support/env.rb index 83f43167f8c4eb5238d7fa26a9c3af09dbd4a1e5..9b4b91474cca8521bcc373170a5c522a588cc0c0 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,5 +1,4 @@ require 'aruba/cucumber' -require 'methadone/cucumber' ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}" LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', 'lib') diff --git a/lib/apex.rb b/lib/apex.rb deleted file mode 100644 index ebc5a85acb0278f73757248b8871dbd5c2c33660..0000000000000000000000000000000000000000 --- a/lib/apex.rb +++ /dev/null @@ -1,50 +0,0 @@ -require 'colorize' -require 'kiss/kiss_serial' -require 'aprs/aprs_kiss' -require 'apex/app_info' - -module Apex - def self.echo_color_frame(frame, port_name, direction_in) - formatted_aprs = [frame[:source].colorize(:green), frame[:destination].colorize(:blue)].join('>') - paths = [] - frame[:path].each do |path| - paths << path.colorize(:cyan) - end - paths = paths.join(',') - if frame[:path] and frame[:path].length > 0 - formatted_aprs = [formatted_aprs, paths].join(',') - end - formatted_aprs += ':' - formatted_aprs += frame[:text] - if direction_in - puts (port_name + ' << ').colorize(:magenta) + formatted_aprs - else - # TODO : make this bold and/or blink - puts (port_name + ' >> ').colorize(:color => :magenta, :mode => :bold) + formatted_aprs - end - end - - def self.main - kiss = Kiss::KissSerial.new('/dev/ttyUSB1', 9600) - aprs_kiss = Aprs::AprsKiss.new(kiss) - aprs_kiss.connect(Kiss::MODE_INIT_KENWOOD_D710) - - # Transmit a beacon when we first start - beacon_frame = {:source => 'WI2ARD-2', - :destination => 'APRS', - :path => ['WIDE1-1', 'WIDE2-2'], - :text => '!/:=i@;N.G& --PHG5790/G/D R-I-R H24 C30'} - aprs_kiss.write(beacon_frame) - echo_color_frame(beacon_frame, 'TNC', false) - - # Display any packets we read in. - while true - frame = aprs_kiss.read - if frame - echo_color_frame(frame, 'TNC', true) - else - sleep(1) - end - end - end -end diff --git a/lib/apex/app_info.rb b/lib/apex/app_info.rb deleted file mode 100644 index d7886bbb0d27661ff5c00825c0f8783c10b53cce..0000000000000000000000000000000000000000 --- a/lib/apex/app_info.rb +++ /dev/null @@ -1,3 +0,0 @@ -module Apex - VERSION = "0.0.1" -end diff --git a/lib/aprs.rb b/lib/aprs.rb new file mode 100644 index 0000000000000000000000000000000000000000..4278b2b7329195a04c634fff9be315c3e30dd129 --- /dev/null +++ b/lib/aprs.rb @@ -0,0 +1,6 @@ +require 'colorize' +require 'kiss/kiss_serial' +require 'aprs/aprs_kiss' + +module Aprs +end diff --git a/lib/aprs/app_info.rb b/lib/aprs/app_info.rb new file mode 100644 index 0000000000000000000000000000000000000000..f9f561fc13d53a8c855064e3169da46ef40361b4 --- /dev/null +++ b/lib/aprs/app_info.rb @@ -0,0 +1,3 @@ +module Aprs + VERSION = "1.0.0" +end