camper_van 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     camper_van (0.0.3)
       eventmachine (~> 0.12.10)
-      firering (~> 1.1.0)
+      firering (~> 1.2.0)
       logging (~> 1.5.1)
       trollop (~> 1.16.2)
 
@@ -18,7 +18,7 @@ GEM
     escape_utils (0.2.4)
     eventmachine (0.12.10)
     ffi (1.0.11)
-    firering (1.1.1)
+    firering (1.2.2)
       em-http-request (~> 0.3.0)
       eventmachine (~> 0.12.10)
       yajl-ruby (~> 0.7.6)

data/camper_van.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = "~> 1.9.2"
+
   s.add_dependency "eventmachine", "~> 0.12.10"
-  s.add_dependency "firering", "~> 1.1.0"
+  s.add_dependency "firering", "~> 1.2.0"
   s.add_dependency "logging", "~> 1.5.1"
   s.add_dependency "trollop", "~> 1.16.2"
 

data/lib/camper_van/channel.rb

@@ -264,7 +264,7 @@ module CamperVan
 
         if %w(Text Tweet Sound Paste Upload).include?(type) && name == client.nick
             logger.debug "skipping message from myself: #{message.type} #{message.body}"
-          return
+          next
         end
 
         case type

data/lib/camper_van/user.rb

@@ -48,7 +48,11 @@ module CamperVan
     def initialize(user)
       @id = user.id
       @name = user.name
-      @account, @server = user.email_address.split("@")
+      if user.email_address
+        @account, @server = user.email_address.split("@")
+      else
+        @account = @server = "unknown"
+      end
       @nick = irc_name user.name
       @idle = false
       @admin = user.admin

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/camper_van/channel_spec.rb

@@ -4,6 +4,7 @@ describe CamperVan::Channel do
 
   class TestClient
     attr_reader :sent, :nick, :user, :host
+    attr_writer :nick
     include CamperVan::ServerReply
     def initialize
       @nick, @user, @host = "nathan", "nathan", "localhost"
@@ -303,6 +304,12 @@ describe CamperVan::Channel do
       )
     end
 
+    it "skips text messages from the current user" do
+      @client.nick = "joe"
+      @channel.map_message_to_irc msg("Text", :body => "hello", :user_id => 10)
+      @client.sent.last.must_equal nil
+    end
+
     it "sends a privmsg with the message when a user says something" do
       @channel.map_message_to_irc msg("Text", :body => "hello")
       @client.sent.last.must_match ":joe!joe@campfire PRIVMSG #test hello"

data/spec/camper_van/user_spec.rb

@@ -2,38 +2,54 @@ require "spec_helper"
 
 describe CamperVan::User do
   context "when initialized from a firering user" do
-    before :each do
-      # User = Struct.new(:connection, :id, :name, :email_address, :admin,
-      # :created_at, :type, :api_auth_token, :avatar_url)
-      @f_user = Firering::User.new(
+
+    # User = Struct.new(:connection, :id, :name, :email_address, :admin,
+    # :created_at, :type, :api_auth_token, :avatar_url)
+    let(:firering_user) {
+      Firering::User.new(
         nil, 12345, "Joe Q. Bob", "joe_bob@example.com", true, Time.now, "asdf", ""
       )
-
-      @user = CamperVan::User.new(@f_user)
-    end
+    }
+    let(:user) { CamperVan::User.new(firering_user) }
 
     it "has a nick" do
-      @user.nick.must_equal "joe_q_bob"
+      user.nick.must_equal "joe_q_bob"
     end
 
     it "has a name" do
-      @user.name.must_equal "Joe Q. Bob"
+      user.name.must_equal "Joe Q. Bob"
     end
 
     it "has an account" do
-      @user.account.must_equal "joe_bob"
+      user.account.must_equal "joe_bob"
     end
 
     it "has a server" do
-      @user.server.must_equal "example.com"
+      user.server.must_equal "example.com"
     end
 
     it "has an id" do
-      @user.id.must_equal 12345
+      user.id.must_equal 12345
     end
 
     it "can be an admin" do
-      @user.admin?.must_equal true
+      user.admin?.must_equal true
+    end
+
+    context "without an email address" do
+      let(:firering_user) {
+        Firering::User.new(
+          nil, 12345, "Joe Q. Bob", nil, true, Time.now, "asdf", ""
+        )
+      }
+
+      it "has an unknown account" do
+        user.account.must_equal "unknown"
+      end
+
+      it "has an unknown server" do
+        user.server.must_equal "unknown"
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70290109557000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70290109557000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.10
 - !ruby/object:Gem::Dependency
   name: firering
-  requirement: &70290109556280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70290109556280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &70290109555680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290109555680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70290109554940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70290109554940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70290109554320 !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: *70290109554320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An IRC to Campfire bridge for IRC-based access to campfire chatrooms
 email:
 - nwitmer@gmail.com
@@ -114,9 +139,9 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: camper_van
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An IRC to Campfire bridge