lita-irc 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f6bcd5ab576ecbe1570ede78cde8a1adf99d0ae
-  data.tar.gz: 9f47d348b44fd21011c85b6959d8b6d14b3b9cbe
+  metadata.gz: a5f6718f839abd60bc28ecfa83cc7fdad901bc39
+  data.tar.gz: cfe790709ff47c4e191e481099bee658e5049abf
 SHA512:
-  metadata.gz: c73638cfc160a3f1271b1595dc580cd973bcd280d6db4807a741e0c870470169acb7c1841337b02eaf883d30a58a1a2f1ed9b9c9dd93df08b78a2245ee0605a0
-  data.tar.gz: 84d8135f94be890ae7a477e1f7deacd442f26b99d74a32406478c2663ce1dc88deddf408e04a9a80da1fdf5c53014ee19c83c79052a59c869c3100ea797612c6
+  metadata.gz: 12fd0af0616013b03b98f74ed7d490f759e5b4bc55684c604642803cf2f695b2cbc17b2dc18d03be4016d95f4e386bca283208f3475efc6fd9574acf4233f9ef
+  data.tar.gz: b55553fd2aab232ec95a82be7ca433b8bd2c33628a0d375e4c1462e1ad28a97d562528be1b3aee78ce3f3a1bb4b6e8377b78c56b2c42da40f57579912423b948

data/lib/lita/adapters/irc.rb

@@ -14,7 +14,6 @@ module Lita
         super
 
         @cinch = Cinch::Bot.new
-        normalize_config
         configure_cinch
         configure_logging
         register_plugin
@@ -25,6 +24,14 @@ module Lita
         cinch.start
       end
 
+      def join(room_id)
+        cinch.join(room_id)
+      end
+
+      def part(room_id)
+        cinch.part(room_id)
+      end
+
       def send_messages(target, strings)
         if target.private_message?
           user = Cinch::User.new(target.user.name, cinch)
@@ -50,15 +57,23 @@ module Lita
 
       private
 
-      def normalize_config
-        Lita.config.adapter.channels = Array(Lita.config.adapter.channels)
-        Lita.config.adapter.nick = Lita.config.robot.name
+      def channels
+        Array(Lita.config.adapter.channels)
+      end
+
+      def nick
+        Lita.config.robot.name
       end
 
       def configure_cinch
         Lita.logger.debug("Configuring Cinch.")
         cinch.configure do |config|
+          config.channels = channels
+          config.nick = nick
+
           Lita.config.adapter.each do |key, value|
+            next if [:channels, :nick].include?(key.to_sym)
+
             if config.class::KnownOptions.include?(key)
               config.send("#{key}=", value)
             end

data/lita-irc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-irc"
-  spec.version       = "1.2.3"
+  spec.version       = "1.3.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{An IRC adapter for Lita.}
@@ -14,12 +14,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", "~> 2.5"
-  spec.add_runtime_dependency "cinch", "~> 2.0"
+  spec.add_runtime_dependency "lita", ">= 2.5"
+  spec.add_runtime_dependency "cinch", ">= 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rspec", ">= 3.0.0.beta2"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
 end

data/spec/lita/adapters/irc/cinch_plugin_spec.rb

@@ -9,57 +9,47 @@ describe Lita::Adapters::IRC::CinchPlugin do
   let(:message) { double("Lita::Message", command!: nil, source: source) }
   let(:source) { double("Lita::Source", room: "#channel", user: user) }
   let(:m) do
-    double(
+    instance_double(
       "Cinch::Message",
       action_message: "foo",
       message: "bar",
-      action?: false
-    ).as_null_object
+      action?: false,
+      channel: cinch_channel,
+      user: cinch_user
+    )
   end
   let(:invite_m) do
-    double(
+    instance_double(
       "Cinch::Message",
-      channel: double("Cinch::Channel"),
-      user: double("Cinch::User", nick: "Carl")
+      channel: cinch_channel,
+      user: cinch_user
     )
   end
+  let(:cinch_channel) { instance_double("Cinch::Channel", name: "#lita.io") }
+  let(:cinch_user) { instance_double("Cinch::User", nick: "Carl") }
 
   before do
-    allow(subject).to receive(:config).and_return(
-      double("Hash", :[] => robot)
-    )
+    allow(subject).to receive(:config).and_return(instance_double("Hash", :[] => robot))
     allow(Lita::Source).to receive(:new).and_return(source)
   end
 
   describe "#execute" do
     it "dispatches regular messages to the robot" do
-      allow(Lita::Message).to receive(:new).with(
-        robot,
-        "bar",
-        source
-      ).and_return(message)
+      allow(Lita::Message).to receive(:new).with(robot, "bar", source).and_return(message)
       expect(robot).to receive(:receive).with(message)
       subject.execute(m)
     end
 
     it "dispatches action messages to the robot" do
       allow(m).to receive(:action?).and_return(true)
-      allow(Lita::Message).to receive(:new).with(
-        robot,
-        "foo",
-        source
-      ).and_return(message)
+      allow(Lita::Message).to receive(:new).with(robot, "foo", source).and_return(message)
       expect(robot).to receive(:receive).with(message)
       subject.execute(m)
     end
 
     it "marks private messages as commands" do
       allow(source).to receive(:room).and_return(nil)
-      allow(Lita::Message).to receive(:new).with(
-        robot,
-        "bar",
-        source
-      ).and_return(message)
+      allow(Lita::Message).to receive(:new).with(robot, "bar", source).and_return(message)
       allow(robot).to receive(:receive)
       expect(message).to receive(:command!)
       subject.execute(m)
@@ -76,9 +66,7 @@ describe Lita::Adapters::IRC::CinchPlugin do
   describe "#on_invite" do
     it "joins the room if the invite came from an admin" do
       allow(subject).to receive(:user_by_nick).and_return(user)
-      allow(Lita::Authorization).to receive(
-        :user_is_admin?
-      ).with(user).and_return(true)
+      allow(Lita::Authorization).to receive(:user_is_admin?).with(user).and_return(true)
       expect(invite_m.channel).to receive(:join)
       subject.on_invite(invite_m)
     end

data/spec/lita/adapters/irc_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Lita::Adapters::IRC, lita: true do
-  let(:robot) { double("Lita::Robot") }
+  let(:robot) { instance_double("Lita::Robot") }
 
   subject { described_class.new(robot) }
 
@@ -40,9 +40,7 @@ describe Lita::Adapters::IRC, lita: true do
   end
 
   it "registers a plugin with Cinch" do
-    expect(subject.cinch.config.plugins.plugins).to include(
-      described_class::CinchPlugin
-    )
+    expect(subject.cinch.config.plugins.plugins).to include(described_class::CinchPlugin)
   end
 
   it "turns Cinch's logging on if config.adapter.log_level is set" do
@@ -50,6 +48,20 @@ describe Lita::Adapters::IRC, lita: true do
     expect(subject.cinch.loggers).not_to be_empty
   end
 
+  describe "#join" do
+    it "joins a channel" do
+      expect(subject.cinch).to receive(:join).with("#lita.io")
+      subject.join("#lita.io")
+    end
+  end
+
+  describe "#part" do
+    it "parts from a channel" do
+      expect(subject.cinch).to receive(:part).with("#lita.io")
+      subject.part("#lita.io")
+    end
+  end
+
   describe "#run" do
     it "connects to IRC" do
       expect(subject.cinch).to receive(:start)
@@ -59,25 +71,19 @@ describe Lita::Adapters::IRC, lita: true do
 
   describe "#send_messages" do
     it "sends messages to rooms" do
-      source = double("Lita::Source", room: "#foo", private_message?: false)
-      channel = double("Cinch::Channel")
-      allow(Cinch::Channel).to receive(:new).with(
-        "#foo",
-        subject.cinch
-      ).and_return(channel)
+      source = instance_double("Lita::Source", room: "#foo", private_message?: false)
+      channel = instance_double("Cinch::Channel")
+      allow(Cinch::Channel).to receive(:new).with("#foo", subject.cinch).and_return(channel)
       expect(channel).to receive(:msg).with("Hello!")
       expect(channel).to receive(:msg).with("How are you?")
       subject.send_messages(source, ["Hello!", "How are you?"])
     end
 
     it "sends messages to users" do
-      user = double("Lita::User", name: "Carl")
-      source = double("Lita::Source", user: user, private_message?: true)
-      user = double("Cinch::User")
-      allow(Cinch::User).to receive(:new).with(
-        "Carl",
-        subject.cinch
-      ).and_return(user)
+      user = instance_double("Lita::User", name: "Carl")
+      source = instance_double("Lita::Source", user: user, private_message?: true)
+      user = instance_double("Cinch::User")
+      allow(Cinch::User).to receive(:new).with("Carl", subject.cinch).and_return(user)
       expect(user).to receive(:msg).with("Hello!")
       expect(user).to receive(:msg).with("How are you?")
       subject.send_messages(source, ["Hello!", "How are you?"])
@@ -86,12 +92,9 @@ describe Lita::Adapters::IRC, lita: true do
 
   describe "#set_topic" do
     it "sets a new topic for the room" do
-      source = double("Lita::Source", room: "#foo")
-      channel = double("Cinch::Channel")
-      expect(Cinch::Channel).to receive(:new).with(
-        "#foo",
-        subject.cinch
-      ).and_return(channel)
+      source = instance_double("Lita::Source", room: "#foo")
+      channel = instance_double("Cinch::Channel")
+      expect(Cinch::Channel).to receive(:new).with("#foo", subject.cinch).and_return(channel)
       expect(channel).to receive(:topic=).with("Topic")
       subject.set_topic(source, "Topic")
     end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: lita-irc
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An IRC adapter for Lita.
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -139,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An IRC adapter for the Lita chat robot.
@@ -157,3 +157,4 @@ test_files:
 - spec/lita/adapters/irc/cinch_plugin_spec.rb
 - spec/lita/adapters/irc_spec.rb
 - spec/spec_helper.rb
+has_rdoc: