cijoe 0.6.0 → 0.7.0

data/README.md

@@ -75,16 +75,17 @@ Campfire notification is included, because it's what we use. Want Joe
 notify your Campfire? Put this in your repo's `.git/config`:
 
     [campfire]
-    	user = your@campfire.email
-    	pass = passw0rd
-    	subdomain = whatever
-    	room = Awesomeness
-    	ssl = false
+      token = your_api_token
+      subdomain = whatever
+      room = Awesomeness
+      ssl = false
+
+Note: your API token may differ between subdomains!
 
 Or do it the old fashion way:
 
     $ cd yourrepo
-    $ git config --add campfire.user chris@ozmm.org
+    $ git config --add campfire.token 98ADFLKJSDOIU7BLAH
     $ git config --add campfire.subdomain github
     etc.
 

data/lib/cijoe/campfire.rb

@@ -15,8 +15,7 @@ class CIJoe
         puts "Can't load Campfire notifier."
         puts "Please add the following to your project's .git/config:"
         puts "[campfire]"
-        puts "\tuser = your@campfire.email"
-        puts "\tpass = passw0rd"
+        puts "\ttoken = your_api_token"
         puts "\tsubdomain = whatever"
         puts "\troom = Awesomeness"
         puts "\tssl = false"
@@ -26,16 +25,15 @@ class CIJoe
     def self.config
       campfire_config = Config.new('campfire', @project_path)
       @config ||= {
-        :subdomain => campfire_config.subdomain.to_s,
-        :user      => campfire_config.user.to_s,
-        :pass      => campfire_config.pass.to_s,
-        :room      => campfire_config.room.to_s,
-        :ssl       => campfire_config.ssl.to_s.strip == 'true'
+        :subdomain => Config.campfire(@project_path).subdomain.to_s,
+        :token     => Config.campfire(@project_path).token.to_s,
+        :room      => Config.campfire(@project_path).room.to_s,
+        :ssl       => Config.campfire(@project_path).ssl.to_s.strip == 'true'
       }
     end
 
     def self.valid_config?
-      %w( subdomain user pass room ).all? do |key|
+      %w( subdomain token room ).all? do |key|
         !config[key.intern].empty?
       end
     end
@@ -51,8 +49,7 @@ class CIJoe
       @room ||= begin
         config = Campfire.config
         campfire = Tinder::Campfire.new(config[:subdomain],
-            :username => config[:user],
-            :password => config[:pass],
+            :token => config[:token],
             :ssl => config[:ssl] || false)
         campfire.find_room_by_name(config[:room])
       end

data/lib/cijoe/version.rb

@@ -1,3 +1,3 @@
 class CIJoe
-  Version = VERSION = "0.6.0"
+  Version = VERSION = "0.7.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Chris Wanstrath