cinch-evalso 0.1.4 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8f1987378c1c54c56c22215f76e4bce7b842b5d
-  data.tar.gz: 6dcfb8e6307cf1de00adf4b36fbfec3b13168a2b
+  metadata.gz: 58d717d34c8cb462c7f0e3b197b3d2480c642e90
+  data.tar.gz: fd0f9b472c61a742802e3bb6bebe26c32b0025f9
 SHA512:
-  metadata.gz: 4dd3df8d050a910ed728af3890c25a90aa7f4f58ce22459fd9c0398394c62d79adae90a1d584fceb9d3e9a21d6a3cce9c0bfa3da639200a5e415c6ed3b564f25
-  data.tar.gz: 56d3a123e45a0c05971d4b237784c4bb4b18e3f4f5ddc9867041a1a9a23f93951aa095f3b00463e5212bee722b8309555c8fd8f75d737f45b06726fb98dbdb10
+  metadata.gz: f631dfc5750f477a69177fca8d72b336af1d0c1060a55d572e730d5d6dd5f44c773087d68d994db933e2f0f6764fbb69ca84e6a76b631600750b1ae4c1e818a6
+  data.tar.gz: eb41cce88b1c93a9323e5cdce982fd7bb882fe0129973cd2493fc46406d2e4bfae91e487b31586e8a939bec9b64cdfb9c225a3e9ed1c5a4f1b56fb1c3a20621b

data/cinch-evalso.gemspec

@@ -1,23 +1,23 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name          = "cinch-evalso"
-  spec.version       = "0.1.4"
-  spec.authors       = ["Serguey Parkhomovsky"]
-  spec.email         = ["xindigo@gmail.com"]
-  spec.homepage      = "https://github.com/sparkhom/cinch-evalso"
-  spec.description   = %q{Cinch plugin to evaluate code with different languages using the eval.so API}
-  spec.summary       = %q{Cinch plugin to query the eval.so API}
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "cinch"
-  spec.add_dependency "httparty"
-  spec.add_dependency "gist"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "cinch-evalso"
+  spec.version       = "0.2"
+  spec.authors       = ["Serguey Parkhomovsky", "Nick Markwell"]
+  spec.email         = ["xindigo@gmail.com"]
+  spec.homepage      = "https://github.com/sparkhom/cinch-evalso"
+  spec.description   = %q{Cinch plugin to evaluate code with different languages using the eval.so API}
+  spec.summary       = %q{Cinch plugin to query the eval.so API}
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "cinch"
+  spec.add_dependency "evalso"
+  spec.add_dependency "gist"
+end

data/lib/cinch/plugins/evalso.rb

@@ -1,56 +1,50 @@
 require 'cinch'
-require 'httparty'
+require 'evalso'
 require 'gist'
 
 module Cinch
-    module Plugins
-        class EvalSo
-            include Cinch::Plugin, HTTParty
-
-            base_uri 'eval.so'
-            format :json
-
-            match /eval ([\S]+) (.+)/, method: :eval
-            match /langs/, method: :langs
-
-            # Print out a list of languages
-            # Params:
-            # +m+:: +Cinch::Message+ object
-            def langs(m)
-                m.reply 'Available languages: ' + self.class.get('/api/languages').keys.join(', ')
-            end
-            
-            # Evaluate code using the eval.so API
-            # Params:
-            # +m+:: +Cinch::Message+ object
-            # +lang+:: The language for code to be evaluated with
-            # +code+:: The code to be evaluated
-            def eval(m, lang, code)
-                options = { :body => {:language => lang, :code => code }.to_json, :headers => { 'Content-Type' => 'application/json' }}
-                res = self.class.post('/api/evaluate', options)
-                # Eval.so brought back an error, print it out and return
-                if res.has_key? 'error'
-                    m.reply 'Error: ' + res['error'], true
-                    return
-                end
-
-                # Print stderr if stdout is empty
-                if res['stdout'].empty?
-                   output = res['stderr']
-                else
-                   output = res['stdout']
-                end
-
-		output = output.gsub(/\n/,' ')
-
-                # According to RFC 2812, the maximum line length on IRC is 510 characters, minus the carriage return
-                # In order to not spam the channel, if the output is greater than one line, convert it to a gist
-                if output.length > 510
-                    m.reply Gist.gist(output, filename: 'result', description: code)['html_url'], true
-                else
-                    m.reply output, true
-                end
-            end
+  module Plugins
+    class EvalSo
+      include Cinch::Plugin
+
+      match /eval ([\S]+) (.+)/, method: :eval
+      match /langs/, method: :langs
+
+      # Print out a list of languages
+      # Params:
+      # +m+:: +Cinch::Message+ object
+      def langs(m)
+        m.safe_reply "Available languages: #{Evalso.languages.keys.join(', ')}"
+      end
+
+      # Evaluate code using the eval.so API
+      # Params:
+      # +m+:: +Cinch::Message+ object
+      # +lang+:: The language for code to be evaluated with
+      # +code+:: The code to be evaluated
+      def eval(m, lang, code)
+        res = Evalso.run(language: lang, code: code)
+
+        # Default to stdout, fall back to stderr.
+        output = res.stdout
+        output = res.stderr if output.empty?
+
+        output = output.gsub(/\n/,' ')
+
+        # According to RFC 2812, the maximum command length on IRC is 512 characters.
+        # This makes our maximum message length 512 - '\r\n'.length - the header information
+        # In order to not spam the channel, if the output is greater than one line, convert it to a gist
+        maxlength = 510 - (":" + " PRIVMSG " + " :").length - @bot.mask.to_s.length - m.target.name.length
+        maxlength = maxlength - ("#{m.user.name}: ").length if m.target.is_a? Channel
+        if output.length > maxlength
+          output = Gist.gist(output, filename: 'result', description: code)['html_url']
         end
+
+        m.safe_reply output, true
+      rescue Evalso::HTTPError => e
+        # Eval.so returned an error, pass it on to IRC.
+        m.safe_reply "Error: #{e.message}", true
+      end
     end
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cinch-evalso
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
 platform: ruby
 authors:
 - Serguey Parkhomovsky
+- Nick Markwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -25,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: evalso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='