Merge branch 'ask-for-password'

Gemfile

@@ -1,4 +1,5 @@
 source 'http://rubygems.org'
+gem 'highline'
 gem 'json', '~> 1.7.7'
 gem 'octokit'
 gem 'rake'

Gemfile.lock

@@ -30,6 +30,7 @@ GEM
     hamsterdam (1.0.8)
       hamster
     hashie (2.0.5)
+    highline (1.6.19)
     json (1.7.7)
     listen (1.1.4)
       rb-fsevent (>= 0.9.3)
@@ -84,6 +85,7 @@ DEPENDENCIES
   coveralls
   guard-rspec
   hamsterdam
+  highline
   json (~> 1.7.7)
   octokit
   pry

lib/octoherder/cli.rb

@@ -1,4 +1,5 @@
 require 'octoherder'
+require 'highline'
 require 'trollop'
 
 
@@ -11,7 +12,7 @@ def self.parse_argv(args)
 OctoHerder helps you manage your multi-repository project.
 
 Usage:
-    
+
     octoherder [options]
 where [options] are:
 HELP
@@ -36,6 +37,11 @@ def self.parse_argv(args)
 
     def self.run(args)
       opts = parse_argv(args)
+      if ! opts[:password_given] then
+        opts[:password_given] = true
+        opts[:password] = HighLine.new.ask("Enter password: ") { |q| q.echo = false }
+      end
+
       kitty = Octokit.new(octoauth(opts))
       CLI.new.run kitty, opts
     end

lib/octoherder/configuration.rb

@@ -3,6 +3,8 @@
 require 'time'
 require 'safe_yaml'
 
+SafeYAML::OPTIONS[:default_mode] = :safe
+
 module OctoHerder
   NEUTRAL_TONE = '#cccccc'
 
@@ -111,7 +113,10 @@ def update_milestones octokit_connection
     def to_octokit_opts hash
       opts = hash.dup
       opts.delete 'title'
-      opts['due_on'] = opts['due_on'].iso8601 if opts['due_on']
+      # Sometimes dates get read in and autoconverted to a Time and sometimes not.
+      if opts['due_on'] && opts['due_on'].kind_of?(String) then
+        opts['due_on'] = DateTime.iso8601(opts['due_on'])
+      end
       opts
     end
 

spec/cli_spec.rb

@@ -18,7 +18,7 @@ def run(args, octokit_connection)
 OctoHerder helps you manage your multi-repository project.
 
 Usage:
-    
+
     octoherder [options]
 where [options] are:
   --input-file, -i <filename/uri>:   Path to the canonical project setup
@@ -133,6 +133,25 @@ def run(args, octokit_connection)
           kitty.should_receive(:password).with(password)
           run(["--user", "me", "--password", password], kitty)
         end
+
+        it "will prompt for a password if none given" do
+          orig_stdin = $stdin
+          begin
+            $stdin = StringIO.new("1234", "r")
+            orig_stdout = $stdout
+            begin
+              $stdout = StringIO.new("", "w+")
+
+              CLI.run(["--user", "me"])
+              $stdout.rewind
+              expect($stdout.read).to include("password")
+            ensure
+              $stdout = orig_stdout
+            end
+          ensure
+            $stdin = orig_stdin
+          end
+        end
       end
     end
 

spec/configuration_spec.rb

@@ -105,7 +105,7 @@ module OctoHerder
         connection.stub(:create_milestone)
 
           connection.should_receive(:create_milestone).with(an_instance_of(Octokit::Repository), 'milestone-1', {'state' => 'closed'}).exactly(repo_count).times
-          connection.should_receive(:create_milestone).with(an_instance_of(Octokit::Repository), 'milestone-2', {'due_on' => '2011-04-10T20:09:31Z'}).exactly(repo_count).times
+          connection.should_receive(:create_milestone).with(an_instance_of(Octokit::Repository), 'milestone-2', {'due_on' => Time.iso8601('2011-04-10T20:09:31Z')}).exactly(repo_count).times
           connection.should_receive(:create_milestone).with(an_instance_of(Octokit::Repository), 'milestone-3', {'state' => 'open', 'description' => 'The third step in total world domination.'}).exactly(repo_count).times
 
         conf.update_milestones connection
@@ -118,7 +118,7 @@ module OctoHerder
         connection.stub(:update_milestone)
 
         connection.should_receive(:update_milestone).with(an_instance_of(Octokit::Repository), 1, {'state' => 'closed'}).exactly(repo_count).times
-        connection.should_receive(:update_milestone).with(an_instance_of(Octokit::Repository), 2, {'due_on' => '2011-04-10T20:09:31Z'}).exactly(repo_count).times
+        connection.should_receive(:update_milestone).with(an_instance_of(Octokit::Repository), 2, {'due_on' => Time.iso8601('2011-04-10T20:09:31Z')}).exactly(repo_count).times
         connection.should_receive(:update_milestone).with(an_instance_of(Octokit::Repository), 3, {'state' => 'open', 'description' => 'The third step in total world domination.'}).exactly(repo_count).times
 
         conf.update_milestones connection