camper_van 0.0.1 → 0.0.2

data/.rvmrc

@@ -4,11 +4,31 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@camper_van"
+environment_id="ruby-1.9.3-p0@camper_van"
+
+#
+# Uncomment the following lines if you want to verify rvm version per project
+#
+# rvmrc_rvm_version="1.10.1" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+#
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+#
+# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
+#
+#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
+#
 
 #
 # First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficicent compared to running through the entire
+# file. This is very fast and efficient compared to running through the entire
 # CLI and selector. If you want feedback on which environment was used then
 # insert the word 'use' after --create as this triggers verbose mode.
 #
@@ -17,15 +37,16 @@ if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
 then
   \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
 
-  if [[ -s ".rvm/hooks/after_use" ]]
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
   then
-    . ".rvm/hooks/after_use"
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
   fi
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
   if ! rvm --create use  "$environment_id"
   then
-    echo "Failed to create RVM environment 'ruby-1.9.2-p180@campervan'."
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
   fi
 fi
 
@@ -35,26 +56,26 @@ fi
 # necessary.
 #
 # filename=".gems"
-# if [[ -s "$filename" ]] ; then
+# if [[ -s "$filename" ]]
+# then
 #   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
 # fi
 
-#
-# If you use bundler and would like to run bundle each time you enter the
-# directory, you can uncomment the following code.
-#
-# export PATH="./bin:/Users/nathan/.rvm/gems/ruby-1.9.2-p180@camper_van/bin:/Users/nathan/.rvm/gems/ruby-1.9.2-p180@global/bin:/Users/nathan/.rvm/rubies/ruby-1.9.2-p180/bin:/Users/nathan/.rvm/bin:/Users/nathan/bin:/Users/nathan/scripts:/usr/local/bin:/usr/local/sbin:/usr/local/share/python:/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11/bin:/Users/nathan/work/git_support/bin:/Users/nathan/work/bin"
-#
-#   # Ensure that Bundler is installed. Install it if it is not.
-#   if ! command -v bundle >/dev/null; then
-#      printf "The rubygem 'bundler' is not installed. Installing it now.\n"
-#      gem install bundler
-#   fi
-#
-#   # Bundle while reducing excess noise.
-#   printf "Bundling your gems. This may take a few minutes on a fresh clone.\n"
-#   bundle --binstubs | grep -v '^Using ' | grep -v ' is complete' | sed '/^$/d'
-#
-# alias bundle="bundle --binstubs"
-#
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && command -v bundle
+# then
+#   bundle install
+# fi
+
+if [[ $- == *i* ]] # check for interactive shells
+then
+    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+else 
+	echo "Using: $GEM_HOME" # don't use colors in interactive shells
+fi
 

data/Gemfile

@@ -9,6 +9,4 @@ group :development do
   gem "rb-fsevent", :require => false
   gem "growl", :require => false
   gem "guard"
-  # 0.4.0.rc versions are still git-only
-  gem "guard-minitest", :git => "https://github.com/guard/guard-minitest.git"
 end

data/Gemfile.lock

@@ -1,14 +1,7 @@
-GIT
-  remote: https://github.com/guard/guard-minitest.git
-  revision: c5c1efb9cd10f3be36de5c8fdb6615f9b74b5ef0
-  specs:
-    guard-minitest (0.4.0)
-      guard (~> 0.4)
-
 PATH
   remote: .
   specs:
-    camper_van (0.0.1)
+    camper_van (0.0.2)
       eventmachine (~> 0.12.10)
       firering (~> 1.1.0)
       logging (~> 1.5.1)
@@ -22,20 +15,20 @@ GEM
       addressable (>= 2.0.0)
       escape_utils
       eventmachine (>= 0.12.9)
-    escape_utils (0.2.3)
+    escape_utils (0.2.4)
     eventmachine (0.12.10)
-    firering (1.1.0)
+    firering (1.1.1)
       em-http-request (~> 0.3.0)
       eventmachine (~> 0.12.10)
       yajl-ruby (~> 0.7.6)
     growl (1.0.3)
-    guard (0.4.2)
+    guard (0.8.4)
       thor (~> 0.14.6)
     little-plugger (1.1.2)
-    logging (1.5.1)
+    logging (1.5.2)
       little-plugger (>= 1.1.2)
-    minitest (2.2.2)
-    rb-fsevent (0.4.0)
+    rake (0.9.2.2)
+    rb-fsevent (0.4.3.1)
     thor (0.14.6)
     trollop (1.16.2)
     yajl-ruby (0.7.9)
@@ -47,6 +40,5 @@ DEPENDENCIES
   camper_van!
   growl
   guard
-  guard-minitest!
-  minitest (~> 2.2.2)
+  rake
   rb-fsevent

data/Procfile

@@ -0,0 +1 @@
+server: ruby -I:lib bin/camper_van 0.0.0.0 $PORT

data/bin/camper_van

@@ -30,6 +30,10 @@ For irc debugging, use the debugging proxy:
 
   opt :log_level, "Log level", :default => "info"
   opt :log_file, "Log file", :short => "f", :type => :string
+  opt :ssl, "Enable SSL for IRC client connections"
+  opt :ssl_private_key, "Path to SSL private key file for IRC client connections, defaults to self-signed", :type => :string
+  opt :ssl_cert, "Path to SSL cert file for IRC client connections, defaults to self-signed", :type => :string
+  opt :ssl_verify_peer, "Verify peers for IRC client connections"
 end
 
 opts = Trollop.with_standard_exception_handling parser do
@@ -54,7 +58,11 @@ else
     ARGV[0] || "127.0.0.1",
     ARGV[1] || 6667,
     :log_level => opts[:log_level].to_sym,
-    :log_to => opts[:log_file]
+    :log_to => opts[:log_file],
+    :ssl => opts[:ssl],
+    :ssl_private_key => opts[:ssl_private_key],
+    :ssl_cert => opts[:ssl_cert],
+    :ssl_verify_peer => opts[:ssl_verify_peer]
   )
 
 end

data/camper_van.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = CamperVan::VERSION
   s.authors     = ["Nathan Witmer"]
   s.email       = ["nwitmer@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/aniero/camper_van"
   s.summary     = %q{An IRC to Campfire bridge}
   s.description = %q{An IRC to Campfire bridge for IRC-based access to campfire chatrooms}
 
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency "logging", "~> 1.5.1"
   s.add_dependency "trollop", "~> 1.16.2"
 
-  s.add_development_dependency "minitest", "~> 2.2.2"
+  s.add_development_dependency "rake"
 end

data/lib/camper_van/channel.rb

@@ -121,10 +121,12 @@ module CamperVan
         # convert ACTIONs
         msg.sub! /^\01ACTION (.*)\01$/, '*\1*'
 
-        if matched = users.values.detect {|u| msg.start_with?(u.nick + ': ')}
-          msg = msg.sub(/^#{matched.nick}/, matched.name)
+        matched = users.values.detect do |user|
+          msg =~ /^#{Regexp.escape(user.nick)}($|\W+(\s|$))/
         end
 
+        msg = msg.sub(/^#{matched.nick}/, matched.name) if matched
+
         room.text(msg) { } # async, no-op callback
       end
 
@@ -295,8 +297,10 @@ module CamperVan
           end
 
         when "Enter"
-          client.campfire_reply :join, name, channel
-          users[user.id] = User.new(user)
+          unless users[user.id]
+            client.campfire_reply :join, name, channel
+            users[user.id] = User.new(user)
+          end
 
         when "Leave", "Kick" # kick is used for idle timeouts
           client.campfire_reply :part, name, channel, "Leaving..."
@@ -337,7 +341,10 @@ module CamperVan
           if message.body =~ /^\*.*\*$/
             client.campfire_reply :privmsg, name, channel, ":\01ACTION " + message.body[1..-2] + "\01"
           else
-            matched = users.values.detect {|u| message.body.start_with?(u.name + ': ')}
+            matched = users.values.detect do |user|
+              message.body =~ /^#{Regexp.escape(user.name)}(\W+(\s|$)|$)/
+            end
+
             if matched
               body = message.body.sub(/^#{matched.name}/, matched.nick)
             else

data/lib/camper_van/command_definition.rb

@@ -3,7 +3,7 @@ module CamperVan
     attr_reader :command
     def initialize(command)
       @command = command
-      @message = "no handler for the #{command.keys.first} command"
+      @message = "no handler for the #{command and command.keys.first} command"
     end
   end
 

data/lib/camper_van/ircd.rb

@@ -53,7 +53,7 @@ module CamperVan
     # client using the configured subdomain and API key.
     def campfire
       @campfire ||= Firering::Connection.new(
-        "http://#{subdomain}.campfirenow.com"
+        "https://#{subdomain}.campfirenow.com"
       ) do |c|
         c.token = api_key
         c.logger = CamperVan.logger
@@ -179,6 +179,7 @@ module CamperVan
     end
 
     handle :join do |args|
+      args = args.map { |args| args.split(",")}.flatten
       args.each do |channel|
         join_channel channel
       end

data/lib/camper_van/server.rb

@@ -7,16 +7,21 @@ module CamperVan
     #
     # bind_address - what address to bind to
     # port         - what port to listen on
-    # log_options  - an optional hash of additional configuration
-    #                options for the logger (see .initialize_logging)
-    def self.run(bind_address="localhost", port=6667, log_options={})
+    # options      - an optional hash of additional configuration
+    #                :log_level - defaults to 'info'
+    #                :log_to - log to filename (string), IO. defaults to STDOUT
+    #                :ssl - use ssl for client connections, defaults to false
+    #                :ssl_private_key - if using ssl, private key file to use, defaults to self-signed
+    #                :ssl_cert - if using ssl, cert file to use, defaults to self-signed
+    #                :ssl_verify_peer - if using ssl, verify client certificates, defaults to false
+    def self.run(bind_address="localhost", port=6667, options={})
 
-      initialize_logging log_options
+      initialize_logging options
 
       EM.run do
         logger = Logging.logger[self.name]
         logger.info "starting server on #{bind_address}:#{port}"
-        EM.start_server bind_address, port, self
+        EM.start_server bind_address, port, self, options
         trap("INT") do
           logger.info "SIGINT, shutting down"
           EM.stop
@@ -58,6 +63,13 @@ module CamperVan
     # Public: returns the instance of the ircd for this connection
     attr_reader :ircd
 
+    # Public: returns connection options
+    attr_reader :options
+
+    def initialize(options={})
+      @options = options
+    end
+
     # Public callback once a server connection is established.
     #
     # Initializes an IRCD instance for this connection.
@@ -69,6 +81,11 @@ module CamperVan
 
       # start up the IRCD for this connection
       @ircd = IRCD.new(self)
+
+      if options[:ssl]
+        logger.info "starting TLS for #{remote_ip}"
+        start_tls(:cert_chain_file => options[:ssl_cert], :private_key_file => options[:ssl_private_key], :verify_peer => options[:ssl_verify_peer])
+      end
     end
 
     # Public: callback for when a line of the protocol has been

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/camper_van/channel_spec.rb

@@ -192,6 +192,28 @@ describe CamperVan::Channel do
       @channel.privmsg "bob_fred: sup dude"
       @room.sent.last.must_match /Bob Fred: sup dude/
     end
+
+    it "converts leading nicknames followed by punctuation" do
+      @room.users = [
+        OpenStruct.new(:id => 11, :name => "Bob Fred", :email_address => "x@y.com"),
+        OpenStruct.new(:id => 12, :name => "Joe", :email_address => "x@y.com")
+      ]
+      @channel.list_users
+
+      @channel.privmsg "bob_fred! sup!"
+      @room.sent.last.must_match /Bob Fred! sup/
+    end
+
+    it "converts just leading nicks to names" do
+      @room.users = [
+        OpenStruct.new(:id => 11, :name => "Bob Fred", :email_address => "x@y.com"),
+        OpenStruct.new(:id => 12, :name => "Joe", :email_address => "x@y.com")
+      ]
+      @channel.list_users
+
+      @channel.privmsg "bob_fred"
+      @room.sent.last.must_match /Bob Fred/
+    end
   end
 
   describe "#current_mode" do
@@ -310,6 +332,27 @@ describe CamperVan::Channel do
       @client.sent.last.must_match %r(PRIVMSG #test :bob_fred: hello)
     end
 
+    it "converts just leading names to nicks" do
+      @room.users = [
+        OpenStruct.new(:id => 11, :name => "Bob Fred", :email_address => "x@y.com"),
+        OpenStruct.new(:id => 12, :name => "Joe", :email_address => "x@y.com")
+      ]
+      @channel.list_users
+      @channel.map_message_to_irc msg("Text", :body => "Bob Fred")
+      @client.sent.last.must_match %r(PRIVMSG #test bob_fred)
+    end
+
+    it "converts leading names plus punctuation to nicks" do
+      @room.users = [
+        OpenStruct.new(:id => 11, :name => "Bob Fred", :email_address => "x@y.com"),
+        OpenStruct.new(:id => 12, :name => "Joe", :email_address => "x@y.com")
+      ]
+      @channel.list_users
+
+      @channel.map_message_to_irc msg("Text", :body => "Bob Fred!!? dude!")
+      @client.sent.last.must_match %r(PRIVMSG #test :bob_fred!!\? dude)
+    end
+
     it "sends an action when a user plays the crickets sound" do
       @channel.map_message_to_irc msg("Sound", :body => "crickets")
       @client.sent.last.must_match /\x01ACTION hears crickets chirping\x01/
@@ -360,6 +403,14 @@ describe CamperVan::Channel do
       @client.sent.last.must_match %r/:joe\S+ JOIN #test/
     end
 
+    it "does not resend a join command when a user enters the room twice" do
+      @channel.map_message_to_irc msg("Enter")
+      @client.sent.clear
+      @client.sent.last.must_equal nil
+      @channel.map_message_to_irc msg("Enter")
+      @client.sent.last.must_equal nil
+    end
+
     it "adds the user to the internal tracking list when a user joins" do
       @channel.map_message_to_irc msg("Enter")
       @client.sent.last.must_match %r/:joe\S+ JOIN #test/

data/spec/camper_van/ircd_spec.rb

@@ -106,9 +106,39 @@ describe CamperVan::IRCD do
         @server.handle :user => ["nathan", 0, 0, "Nathan"]
       end
 
-      # it "connects to the campfire API" do
-      #   skip "campfire api next!"
-      # end
+      context "with a JOIN command" do
+        before :each do
+          @server.campfire = Class.new do
+            def rooms
+              yield [
+                OpenStruct.new(:name => "Test"),
+                OpenStruct.new(:name => "Day Job")
+              ]
+            end
+          end.new
+          @connection.sent.clear
+        end
+
+        it "joins the given room" do
+          @server.handle :join => ["#test"]
+          @server.channels["#test"].must_be_instance_of CamperVan::Channel
+        end
+
+        it "returns an error if the room doesn't exist" do
+          @server.handle :join => ["#foo"]
+          @server.channels["#foo"].must_equal nil
+          @connection.sent.last.must_match /no such.*room/i
+        end
+
+        it "joins multiple channels if given" do
+          @server.handle :join => ["#test,#day_job"]
+          @connection.sent.must_be_empty
+          @server.channels["#test"].must_be_instance_of CamperVan::Channel
+          @server.channels["#day_job"].must_be_instance_of CamperVan::Channel
+          @ser
+        end
+      end
+
     end
 
     context "with a MODE command" do

data/spec/camper_van/server_spec.rb

@@ -9,8 +9,16 @@ describe CamperVan::Server do
     include CamperVan::Server
 
     attr_reader :sent
-    def initialize
+    attr_reader :tls_started
+    def initialize(*)
+      super
+
       @sent = []
+      @tls_started = false
+    end
+
+    def start_tls(*)
+      @tls_started = true
     end
 
     def close_connection
@@ -25,13 +33,27 @@ describe CamperVan::Server do
     end
   end
 
-  before :each do
-    @server = TestServer.new
-    @server.post_init
+  describe "#post_init" do
+    it "starts TLS if the ssl option is true" do
+      @server = TestServer.new(:ssl => true)
+
+      @server.post_init
+      @server.tls_started.must_equal true
+    end
+
+    it "does not start TLS if the ssl option is not true" do
+      @server = TestServer.new
+
+      @server.post_init
+      @server.tls_started.must_equal false
+    end
   end
 
   describe "#receive_line" do
     it "allows for a failed attempt at registration" do
+      @server = TestServer.new
+      @server.post_init
+
       @server.receive_line "PASS invalid"
       @server.receive_line "NICK nathan" # ignored
       @server.receive_line "USER nathan 0 0 :Nathan" # ignored

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-04 00:00:00.000000000 -06:00
-default_executable: 
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152888420 !ruby/object:Gem::Requirement
+  requirement: &70178180843580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2152888420
+  version_requirements: *70178180843580
 - !ruby/object:Gem::Dependency
   name: firering
-  requirement: &2152887920 !ruby/object:Gem::Requirement
+  requirement: &70178180842800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152887920
+  version_requirements: *70178180842800
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2152887460 !ruby/object:Gem::Requirement
+  requirement: &70178180842200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152887460
+  version_requirements: *70178180842200
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2152887000 !ruby/object:Gem::Requirement
+  requirement: &70178180841700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,18 +54,18 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152887000
+  version_requirements: *70178180841700
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &2152886540 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70178180841280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152886540
+  version_requirements: *70178180841280
 description: An IRC to Campfire bridge for IRC-based access to campfire chatrooms
 email:
 - nwitmer@gmail.com
@@ -81,6 +80,7 @@ files:
 - Gemfile.lock
 - Guardfile
 - LICENSE
+- Procfile
 - README.md
 - Rakefile
 - bin/camper_van
@@ -105,8 +105,7 @@ files:
 - spec/camper_van/server_spec.rb
 - spec/camper_van/user_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ''
+homepage: https://github.com/aniero/camper_van
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -126,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: camper_van
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An IRC to Campfire bridge