lita-campfire 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c211f86c982dcebd59e43f4d0b60f8f1582069ad
-  data.tar.gz: 939f1560531422690bac92a37c4331c18811d00c
+  metadata.gz: 0f48672b5bfe54bea05b3c96fca48d4766d80c72
+  data.tar.gz: 7312e56bbcd14406afb6f929f805d735c79a2019
 SHA512:
-  metadata.gz: c62eefacfbcb724757faa05f3322861086355048f88ad532b6525b33c94659ed9a1fd7c64ac23706337e7638a9f15ba5963f81f1d63776ab267e72178043e6b6
-  data.tar.gz: 06bb18566587a2c6b51daaa738205446735abf52c175165634f3b3f79f88dee4d89cacc208839e629df003c2fc771d97a0a2737e16c56a43d58c56a3dec6d593
+  metadata.gz: ac6aa09ea87963f92d5eb22e6edc968f7c5ff4a3bfbad1e2e142cb24f27b5d5794fa3dad5054093c1d38a663a98b7180a222cd316703f66e33e9e82e9e858850
+  data.tar.gz: 2366dea862aea4d8dcf3b367a6f33110a2934820bab30d6088aff5211e1ea03e306d99d3be8f1611fd507c3c8dddea9c95de204a5e652c51937575ece051e0c9

data/lib/lita/adapters/campfire.rb

@@ -1,8 +1,14 @@
 module Lita
   module Adapters
     class Campfire < Adapter
-      require_configs :subdomain, :apikey, :rooms
-      OPTIONAL_CONFIG_OPTIONS = %i(debug tinder_options)
+      namespace 'campfire'
+
+      config :subdomain, type: String, required: true
+      config :apikey, type: String, required: true
+      config :rooms, type: Array, required: true
+
+      config :debug, type: [TrueClass, FalseClass], default: false
+      config :tinder_options, type: Hash, default: {}
 
       attr_reader :connector
 
@@ -13,10 +19,10 @@ module Lita
           subdomain: config.subdomain,
           apikey: config.apikey,
           rooms: rooms,
+          debug: config.debug,
+          tinder_options: config.tinder_options
         }
 
-        options.merge!(optional_config_options)
-
         @connector = Connector.new(
           robot,
           options
@@ -46,7 +52,7 @@ module Lita
       private
 
       def config
-          Lita.config.adapter
+        Lita.config.adapters.campfire
       end
 
       def rooms
@@ -56,15 +62,8 @@ module Lita
       def disconnect
         connector.disconnect
       end
-
-      def optional_config_options
-        OPTIONAL_CONFIG_OPTIONS.each_with_object({}) do |config_option, options|
-          config_option_value = config.public_send(config_option)
-          options[config_option] = config_option_value if config_option_value
-        end
-      end
     end
 
     Lita.register_adapter(:campfire, Campfire)
   end
-end
+end

data/lib/lita/adapters/campfire/connector.rb

@@ -38,6 +38,8 @@ module Lita
             messages.each do |message|
               if message.include?("\n")
                 my_room.paste message
+              elsif message.start_with?("/play ")
+                my_room.play message.sub("/play ", "")
               else
                 my_room.speak message
               end
@@ -69,4 +71,4 @@ module Lita
       end
     end
   end
-end
+end

data/lita-campfire.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-campfire'
-  spec.version       = '0.2.1'
+  spec.version       = '0.3.0'
   spec.authors       = ['Jose Luis Salas', 'Zac Stewart']
   spec.email         = ['josacar@gmail.com', 'zgstewart@gmail.com']
   spec.description   = %q{A Campfire adapter for Lita.}
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.metadata      = { 'lita_plugin_type' => 'adapter' }
 
-  spec.add_runtime_dependency 'lita', '>= 2.7.0', '< 4.0.0'
+  spec.add_runtime_dependency 'lita', '>= 4.0.0'
   spec.add_runtime_dependency 'tinder', '~> 1.10.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/lita/adapters/campfire/connector_spec.rb

@@ -106,6 +106,15 @@ describe Campfire::Connector, lita: true do
           subject.send_messages room, [ message ]
         end
       end
+
+      context 'with a sound' do
+        let(:message) { "/play yeah" }
+
+        it 'plays a sound into room' do
+          expect(room).to receive(:play).with(message.sub("/play ",""))
+          subject.send_messages room, [ message ]
+        end
+      end
     end
 
     describe '#set_topic' do

data/spec/lita/adapters/campfire_spec.rb

@@ -2,10 +2,12 @@ require 'spec_helper'
 
 describe Lita::Adapters::Campfire, lita: true do
   before do
-    Lita.configure do |config|
-      config.adapter.subdomain = 'foodomain'
-      config.adapter.apikey = 'fooapikey'
-      config.adapter.rooms = ['fooroom']
+    registry.register_adapter(:campfire, described_class)
+
+    registry.configure do |config|
+      config.adapters.campfire.subdomain = 'foodomain'
+      config.adapters.campfire.apikey = 'fooapikey'
+      config.adapters.campfire.rooms = ['fooroom']
     end
 
     allow(described_class::Connector).to receive(:new).and_return(connector)
@@ -13,37 +15,21 @@ describe Lita::Adapters::Campfire, lita: true do
 
   subject { described_class.new(robot) }
 
-  let(:robot) { instance_double(Lita::Robot) }
+  let(:robot) { Lita::Robot.new(registry) }
   let(:connector) { instance_double(Lita::Adapters::Campfire::Connector) }
 
   it "registers with Lita" do
     expect(Lita.adapters[:campfire]).to eql(described_class)
   end
 
-  it "requires config.subdomain, config.apikey and config.rooms" do
-    Lita.clear_config
-    expect(Lita.logger).to receive(:fatal).with(/subdomain, apikey, rooms/)
-    expect { subject }.to raise_error(SystemExit)
-  end
-
-  context 'passing optional variables' do
-    optional_config = described_class::OPTIONAL_CONFIG_OPTIONS
-    optional_config.each do |option|
-      it "does not set #{option} hash value if option is not set" do
-        expect(described_class::Connector).not_to receive(:new).with(robot, hash_including(option.to_sym))
-        subject
-      end
+  it 'can receive hash with tinder options' do
+    tinder_options = { timeout: 30, auto_reconnect: false }
+    Lita.configure do |config|
+      config.adapters.campfire.tinder_options = tinder_options
     end
 
-    it 'can receive hash with tinder options' do
-      tinder_options = { timeout: 30, auto_reconnect: false }
-      Lita.configure do |config|
-        config.adapter.tinder_options = tinder_options
-      end
-
-      expect(described_class::Connector).to receive(:new).with(robot, hash_including(:tinder_options => tinder_options))
-      subject
-    end
+    expect(described_class::Connector).to receive(:new).with(robot, hash_including(:tinder_options => tinder_options))
+    subject
   end
 
   describe '#run' do
@@ -105,4 +91,4 @@ describe Lita::Adapters::Campfire, lita: true do
       subject.shut_down
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -11,5 +11,6 @@ end
 
 require "lita-campfire"
 require "lita/rspec"
+Lita.version_3_compatibility_mode = false
 
 include Lita::Adapters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-campfire
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,16 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
@@ -26,9 +23,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -126,7 +120,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - lib/lita-campfire.rb
@@ -160,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Campfire adapter for the Lita chat robot.

data/Gemfile.lock

@@ -1,106 +0,0 @@
-PATH
-  remote: .
-  specs:
-    lita-campfire (0.2.1)
-      lita (>= 2.7.0, < 4.0.0)
-      tinder (~> 1.10.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    eventmachine (1.0.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (2.1.2)
-    http_parser.rb (0.5.3)
-    http_router (0.11.1)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
-    i18n (0.6.11)
-    ice_nine (0.11.0)
-    json (1.8.1)
-    lita (3.3.1)
-      bundler (>= 1.3)
-      faraday (>= 0.8.7)
-      http_router (>= 0.11.1)
-      i18n (>= 0.6.9)
-      ice_nine (>= 0.11.0)
-      multi_json (>= 1.7.7)
-      puma (>= 2.7.1)
-      rack (>= 1.5.2)
-      rb-readline (>= 0.5.1)
-      redis-namespace (>= 1.3.0)
-      thor (>= 0.18.1)
-    mime-types (2.3)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    netrc (0.7.7)
-    puma (2.9.0)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
-    rake (10.3.2)
-    rb-readline (0.5.1)
-    redis (3.1.0)
-    redis-namespace (1.5.1)
-      redis (~> 3.0, >= 3.0.4)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
-    simple_oauth (0.1.9)
-    simplecov (0.9.0)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    tinder (1.10.0)
-      eventmachine (~> 1.0)
-      faraday (~> 0.9.0)
-      faraday_middleware (~> 0.9)
-      hashie (>= 1.0, < 3)
-      json (~> 1.8.0)
-      mime-types
-      multi_json (~> 1.7)
-      twitter-stream (~> 0.1)
-    tins (1.3.0)
-    twitter-stream (0.1.16)
-      eventmachine (>= 0.12.8)
-      http_parser.rb (~> 0.5.1)
-      simple_oauth (~> 0.1.4)
-    url_mount (0.2.1)
-      rack
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  coveralls
-  lita-campfire!
-  rake
-  rspec (~> 3.0)
-  simplecov