capistrano-campfire 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
     eventmachine (1.0.0)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    faraday_middleware (0.8.8)
+    faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     git (1.2.5)
     hashie (1.2.0)
@@ -23,7 +23,7 @@ GEM
       rake
     json (1.7.5)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.4.0)
     multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)

data/README.rdoc

@@ -11,13 +11,13 @@ Install it the usual way:
 And here's a quick example for your `config/deploy.rb`:
 
     require 'capistrano/campfire'
-    
+
     set :campfire_options, :account => 'zim',
                            :room => 'World Conquest',
                            :token => '001000101110101001011112',
                            :ssl => true
-    
-    
+
+
     task :ohai do
       campfire_room.speak 'o hai'
     end
@@ -26,7 +26,7 @@ And here's a quick example for your `config/deploy.rb`:
 You can also be posting to multiple campfire rooms/accounts.
 
     require 'capistrano/campfire'
-    
+
     set :campfire_options, :rooms => [{
                                        :account => 'zim',
                                        :room => 'World Conquest',
@@ -37,15 +37,18 @@ You can also be posting to multiple campfire rooms/accounts.
                                        :token => '2001000101110101001011110',
                                      }],
                            :ssl => true
-    
-    
+
+
     task :ohai do
       campfire_rooms.speak 'o hai'
     end
 
 
+Instead of `room` option, you can pass the `room_id` if your room name contains some special characters.
+
+
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/capistrano-campfire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-campfire"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = "2012-10-15"
+  s.date = "2013-03-16"
   s.description = " capistrano-tinder is a very simple library for making a Campfire room accessible from capistrano. All it does is provide said access, and nothing more, preferring to let other gems do that trickery.  "
   s.email = "josh@technicalpickles.com"
   s.extra_rdoc_files = [
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "capistrano-campfire.gemspec",
-    "capistrano-tinder.gemspec",
     "lib/capistrano-campfire.rb",
     "lib/capistrano/campfire.rb",
     "spec/capistrano-campfire_spec.rb",
@@ -34,7 +33,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/technicalpickles/capistrano-campfire"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.23"
   s.summary = "Post to Campfire from capistrano"
 
   if s.respond_to? :specification_version then

data/lib/capistrano/campfire.rb

@@ -19,13 +19,21 @@ module Capistrano
           ssl = room_options[:ssl] || campfire_options[:ssl]
           ssl_verify = room_options[:ssl_verify] || campfire_options[:ssl_verify]
           room_name = room_options[:room] || campfire_options[:room]
+          room_id = room_options[:room] || campfire_options[:room_id]
 
 
           campfire = ::Tinder::Campfire.new account,
             :token => token,
             :ssl => ssl,
             :ssl_verify => ssl_verify
-          campfire.find_room_by_name(room_name)
+
+          if room_name
+            campfire.find_room_by_name(room_name)
+          elsif room_id
+            campfire.find_room_by_id(room_id)
+          else
+            raise "Please, specify room name or room_id for your Campfire room"
+          end
         end
       end
 

data/spec/capistrano-campfire_spec.rb

@@ -16,6 +16,44 @@ describe Capistrano::Campfire do
       configuration.campfire_options.should == {}
     end
 
+
+    context "with configuration for a single room (by room_id)" do
+      before do
+        configuration.set :campfire_options, {
+          :account => "awesomellc",
+          :token => "yyz123",
+          :ssl => true,
+          :room_id => 1
+        }
+
+        @campfire = stub("campfire")
+        ::Tinder::Campfire.should_receive(:new).with("awesomellc", :token => "yyz123", :ssl => true, :ssl_verify => nil).and_return(@campfire)
+
+        @room = stub("room")
+        @campfire.should_receive(:find_room_by_id).with(1).and_return(@room)
+
+      end
+
+      it "speaks in a single room using `campfire_room.speak`" do
+        @room.should_receive(:speak).with("IMPENDING DOOM")
+
+        configuration.campfire_room.speak "IMPENDING DOOM"
+      end
+
+      it "pastes in a single room using `campfire_room.paste`" do
+        @room.should_receive(:paste).with("IMPENDING DOOM")
+
+        configuration.campfire_room.paste "IMPENDING DOOM"
+      end
+
+      it "plays in a single room using `campfire_room.play`" do
+        @room.should_receive(:play).with("IMPENDING DOOM")
+
+        configuration.campfire_room.play "IMPENDING DOOM"
+      end
+
+    end
+
     context "with configuration for a single room" do
       before do
         configuration.set :campfire_options, {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-campfire
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70225647408000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225647408000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70225647406840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225647406840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225647405420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70225647405420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70225647549080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225647549080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano-spec
-  requirement: &70225647548260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225647548260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' capistrano-tinder is a very simple library for making a Campfire
   room accessible from capistrano. All it does is provide said access, and nothing
   more, preferring to let other gems do that trickery.  '
@@ -84,7 +109,6 @@ files:
 - Rakefile
 - VERSION
 - capistrano-campfire.gemspec
-- capistrano-tinder.gemspec
 - lib/capistrano-campfire.rb
 - lib/capistrano/campfire.rb
 - spec/capistrano-campfire_spec.rb
@@ -102,9 +126,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4379137590683155220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Post to Campfire from capistrano

data/capistrano-tinder.gemspec

@@ -1,55 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{capistrano-tinder}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-08-17}
-  s.description = %q{ capistrano-tinder is a very simple library for making a Campfire room accessible from capistrano. All it does is provide said access, and nothing more, preferring to let other gems do that trickery.  }
-  s.email = %q{josh@technicalpickles.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".gitignore",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "capistrano-tinder.gemspec",
-    "lib/capistrano-campfire.rb",
-    "lib/capistrano/campfire.rb",
-    "spec/capistrano-tinder_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/technicalpickles/capistrano-tinder}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Post to Campfire from capistrano}
-  s.test_files = [
-    "spec/capistrano-tinder_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
-end
-