cinch-convert 1.0.0 → 1.0.1

data/README.md

@@ -39,7 +39,7 @@ alternate location.
 
     c.plugins.options[Cinch::Plugins::Convert][:units_path] = '/usr/bin/gunits'
 
-Once that's all done, just use `.convert x unit1 to unit2` in the channel.
+Once that's all done, just use `!convert x unit1 to unit2` in the channel.
 
 ## Contributing
 

data/cinch-convert.gemspec

@@ -4,18 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cinch/plugins/convert/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cinch-convert"
+  gem.name          = 'cinch-convert'
   gem.version       = Cinch::Plugins::Convert::VERSION
-  gem.authors       = ["Brian Haberer", "Paul Visscher"]
-  gem.email         = ["bhaberer@gmail.com"]
+  gem.authors       = ['Brian Haberer', 'Paul Visscher']
+  gem.email         = ['bhaberer@gmail.com']
   gem.description   = %q{Cinch Plugin for Coverting Units via the units binary}
   gem.summary       = %q{Cinch Plugin for converting units}
-  gem.homepage      = "https://github.com/canonical-hackers/cinch-convert"
+  gem.homepage      = 'https://github.com/canonical-hackers/cinch-convert'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/cinch-convert.rb

@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 require 'cinch/plugins/convert/version'
-require 'cinch/plugins/convert/convert'
+require 'cinch/plugins/convert'

data/lib/cinch/plugins/convert.rb

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+require 'cinch'
+
+module Cinch::Plugins
+  # Cinch Plugin to convert units
+  class Convert
+    include Cinch::Plugin
+
+    self.help = 'Use .convert <thing 1> to <thing 2> to do a unit ' +
+                'conversion. (e.g. .convert 5 feet to meters)'
+
+    match /convert (.+) to (.+)/
+
+    def initialize(*args)
+      super
+      @units_path = config[:units_path] || '/usr/bin/units'
+    end
+
+    def execute(m, from, to)
+      m.reply convert(from, to), true
+    end
+
+    private
+
+    def convert(from, to)
+      return "Sorry, there's a configuration issue." unless units_bin_exists?
+      return if from.nil? || to.nil?
+
+      units_line = get_units_output(from, to)
+
+      if units_line.match(/Unknown unit/)
+        "Sorry, #{units_line.downcase}."
+      elsif units_line.match(/conformability error/)
+        'Sorry, there was an error when making that conversion.'
+      else
+        "#{from} is #{units_line} #{to}."
+      end
+    end
+
+    def get_units_output(from, to)
+      units_output = IO.popen([@units_path, '-t', from, to])
+
+      # we only take one line here because the first line of output is
+      # either an error message or the part of the conversion output we
+      # want.
+      units_output.readline.chomp!
+    end
+
+    def units_bin_exists?
+      return true if File.exist? @units_path
+      debug 'Cinch can not find the unit conversion binary.'
+      false
+    end
+  end
+end

data/lib/cinch/plugins/convert/version.rb

@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-
 module Cinch
   module Plugins
+    # Versioning information
     class Convert
-      VERSION = "1.0.0"
+      VERSION = '1.0.1'
     end
   end
 end

data/spec/cinch-convert_spec.rb

@@ -12,7 +12,7 @@ describe Cinch::Plugins::Convert do
     it 'should handle the units binary\'s absence with grace' do
       @bot = make_bot(Cinch::Plugins::Convert, { :units_path => '/usr/baddir/units' })
       msg = make_message(@bot, '!convert 3 foo to bar')
-      get_replies(msg).last.chomp.
+      get_replies(msg).last.text.
         should == 'test: Sorry, there\'s a configuration issue.'
     end
   end
@@ -20,25 +20,25 @@ describe Cinch::Plugins::Convert do
   describe 'conversions' do
     it 'should alow users to convert units' do
       msg = make_message(@bot, '!convert 2 inches to feet')
-      get_replies(msg).last.chomp.
+      get_replies(msg).last.text.
         should == 'test: 2 inches is 0.16666667 feet.'
     end
 
     it 'should allow users to convert temps' do
       msg = make_message(@bot, '!convert tempF(32) to tempC')
-      get_replies(msg).last.chomp.
+      get_replies(msg).last.text.
         should == 'test: tempF(32) is 0 tempC.'
     end
 
     it 'should return an error on conformability issues' do
       msg = make_message(@bot, '!convert 15 minutes to gallons')
-      get_replies(msg).last.chomp.
-        should == 'test: Sorry, there was a conformability error when making that conversion.'
+      get_replies(msg).last.text.
+        should == 'test: Sorry, there was an error when making that conversion.'
     end
 
     it 'should return an error on invalid units' do
       msg = make_message(@bot, '!convert 15 foo to bar')
-      get_replies(msg).last.chomp.
+      get_replies(msg).last.text.
         should == 'test: Sorry, unknown unit \'foo\'.'
     end
 

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
 require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
 require 'cinch-convert'
 require 'cinch/test'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-convert
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,12 +107,13 @@ files:
 - Rakefile
 - cinch-convert.gemspec
 - lib/cinch-convert.rb
-- lib/cinch/plugins/convert/convert.rb
+- lib/cinch/plugins/convert.rb
 - lib/cinch/plugins/convert/version.rb
 - spec/cinch-convert_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/canonical-hackers/cinch-convert
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cinch Plugin for converting units

data/lib/cinch/plugins/convert/convert.rb

@@ -1,49 +0,0 @@
-require 'cinch'
-
-module Cinch::Plugins
-  class Convert
-    include Cinch::Plugin
-
-    self.help = "Use .convert <thing 1> to <thing 2> to do a unit conversion. (e.g. .convert 5 feet to meters)"
-
-    match /convert (.+) to (.+)/
-
-    def initialize(*args)
-      super
-      @units_path = config[:units_path] || '/usr/bin/units'
-    end
-
-    def execute(m, from, to)
-      m.reply convert(from, to), true
-    end
-
-    private
-
-    def convert(from, to)
-      return "Sorry, there's a configuration issue." unless units_binary_exists?
-
-      unless from.nil? || to.nil?
-        units_output = IO.popen([@units_path, "-t", from, to])
-
-        # we only take one line here because the first line of output is
-        # either an error message or the part of the conversion output we
-        # want.
-        units_line = units_output.readline.chomp!
-
-        if units_line.match(/Unknown unit/)
-          "Sorry, #{units_line.downcase}."
-        elsif units_line.match(/conformability error/)
-          "Sorry, there was a conformability error when making that conversion."
-        else
-          "#{from} is #{units_line} #{to}."
-        end
-      end
-    end
-
-    def units_binary_exists?
-      return true if File.exist? @units_path
-      debug "Cinch can't find the unit conversion binary."
-      false
-    end
-  end
-end