cinch-calculate 1.0.0 → 1.0.5

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'cinch-test', :git => 'git://github.com/jayferd/cinch-test'
 # Specify your gem's dependencies in cinch-calculate.gemspec
 gemspec

data/README.md

@@ -39,11 +39,11 @@ alternate location.
 
     c.plugins.options[Cinch::Plugins::Calculate][:units_path] = '/usr/bin/gunits'
 
-Once that's all done, just use .math in the channel.
+Once that's all done, just use !math in the channel.
 
-    17:31 <@xentrac> .math 1000 W/m^2 * pi * earthradius^2
+    17:31 <@xentrac> !math 1000 W/m^2 * pi * earthradius^2
     17:31 < marvin> xentrac: 1.2751652e+17 kg m^2 / s^3
-    17:31 <@xentrac> .math (1000 W/m^2 * pi * earthradius^2) / (quadrillion btu / year)
+    17:31 <@xentrac> !math (1000 W/m^2 * pi * earthradius^2) / (quadrillion btu / year)
     17:31 < marvin> xentrac: 3814043.9
 
 

data/cinch-calculate.gemspec

@@ -4,21 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cinch/plugins/calculate/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cinch-calculate"
+  gem.name          = 'cinch-calculate'
   gem.version       = Cinch::Plugins::Calculate::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 to alow users to pass mathematical problems to the bot for evaluation}
   gem.summary       = %q{Cinch Plugin for Math}
-  gem.homepage      = "https://github.com/canonical-hackers/cinch-calculate"
+  gem.homepage      = 'https://github.com/canonical-hackers/cinch-calculate'
+  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'
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'cinch-test'
+
+  gem.add_dependency 'cinch',               '~> 2.0.12'
+  gem.add_dependency 'cinch-cooldown',      '~> 1.1.1'
 end

data/lib/cinch-calculate.rb

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

data/lib/cinch/plugins/{calculate/calculate.rb → calculate.rb}

@@ -1,10 +1,16 @@
+# -*- encoding : utf-8 -*-
 require 'cinch'
+require 'cinch/cooldown'
 
 module Cinch::Plugins
+  # Cinch plugin to allow complex math calculations to be done.
   class Calculate
     include Cinch::Plugin
 
-    self.help = "Use .math <problem> to do math computations. (e.g. 5 feet / inches, .math sin(2) + 4)"
+    self.help = 'Use .math <problem> to do math computations.' +
+                '(e.g. 5 feet / inches, .math sin(2) + 4)'
+
+    enforce_cooldown
 
     match /math (.+)/
 
@@ -21,14 +27,15 @@ module Cinch::Plugins
 
     def math(problem_string)
       return 'Sorry, I can\'t do that' unless units_binary_exists?
-      return IO.popen([@units_path, "-t", problem_string]).readline
+      return IO.popen([@units_path, "-t", problem_string]).readline.chomp
     rescue EOFError
-      debug "Make sure you have GNU Units installed and not the BSD Units that ships with OSX."
+      debug 'Make sure you have GNU Units installed ' +
+            'and not the BSD Units that ships with OSX.'
     end
 
     def units_binary_exists?
       return true if File.exist? @units_path
-      debug "Cinch can't find the unit conversion binary."
+      debug 'Cinch can\'t find the unit conversion binary.'
       false
     end
   end

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

@@ -1,7 +1,9 @@
+# -*- encoding : utf-8 -*-
 module Cinch
   module Plugins
+    # Versioning info
     class Calculate
-      VERSION = "1.0.0"
+      VERSION = '1.0.5'
     end
   end
 end

data/spec/cinch-calculate_spec.rb

@@ -11,17 +11,13 @@ describe Cinch::Plugins::Calculate do
   describe 'configuration' do
     it 'should handle units binary not existing gracefully' do
       @bot = make_bot(Cinch::Plugins::Calculate, { :units_path => '/usr/baddir/units' })
-      msg = make_message(@bot, '!math 2 + 2')
-
-      get_replies(msg).last.chomp.
+      get_replies(make_message(@bot, '!math 2 + 2')).last.text.
         should == 'test: Sorry, I can\'t do that'
     end
   end
 
   it 'should allow basic math' do
-    msg = make_message(@bot, '!math 2 + 2')
-
-    get_replies(msg).last.chomp.
+    get_replies(make_message(@bot, '!math 2 + 2')).last.text.
       should == 'test: 4'
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-calculate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,6 +76,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cinch
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+- !ruby/object:Gem::Dependency
+  name: cinch-cooldown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: Cinch Plugin to alow users to pass mathematical problems to the bot for
   evaluation
 email:
@@ -92,12 +124,13 @@ files:
 - Rakefile
 - cinch-calculate.gemspec
 - lib/cinch-calculate.rb
-- lib/cinch/plugins/calculate/calculate.rb
+- lib/cinch/plugins/calculate.rb
 - lib/cinch/plugins/calculate/version.rb
 - spec/cinch-calculate_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/canonical-hackers/cinch-calculate
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -116,7 +149,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 Math