capfire 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/generators/capfire_generator.rb

@@ -2,26 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + "/lib/insert_commands.rb")
 
 class CapfireGenerator < Rails::Generator::Base
   def add_options!(opt)
-    puts "Adding options"
     opt.on('-a', '--account=account', String, "Your account") {|v| options[:campfire_account] = v}
     opt.on('-k', '--token=token', String, "Your token key") {|v| options[:campfire_token] = v}
     opt.on('-r', '--chatroom=room', String, "The chatroom") {|v| options[:chat_room] = v}
   end
 
   def manifest
-    if campfire_file_exists?
-      puts "You already have a ~/.campfire file, please remove this to use the generator"
-      exit
-    end
-    if !options[:campfire_token] && !options[:chat_room] && !options[:campfire_account]
-      puts options.inspect
-      puts "Token and chat room are required"
+    if !campfire_file_exists? && !options[:campfire_token] && !options[:chat_room] && !options[:campfire_account]
+      puts "Token (-k), account (-a) and chatroom (-r) are required on first run."
       exit
     end
 
     record do |m|
       if ['config/deploy.rb', 'Capfile'].all? { |file| File.exists?(file) }
         m.append_to 'config/deploy.rb', capistrano_hook
+      else
+        puts "No config/deploy discovered, so I've done nothing."
       end
 
       conf = <<-CONF
@@ -30,9 +26,10 @@ campfire:
   token: #{options[:campfire_token]}
   room: #{options[:chat_room]}
 CONF
-puts options.inspect
-      File.open(File.join(ENV['HOME'],'.campfire'), 'w') do |out|
-        out.write(conf)
+      unless campfire_file_exists?
+        File.open(File.join(ENV['HOME'],'.campfire'), 'w') do |out|
+          out.write(conf)
+        end
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - pjaspers