mortar 0.15.25 → 0.15.26

data/lib/mortar/auth.rb

@@ -180,9 +180,9 @@ class Mortar::Auth
 
     def ask_for_github_username
       puts
-      puts "Please enter your github username (not email address)."
+      puts "Please enter your GitHub username (not email address)."
 
-      print "Github Username: "
+      print "GitHub Username: "
       github_username = ask
       github_username
     end
@@ -250,11 +250,15 @@ class Mortar::Auth
       task_id = api.update_user(@mortar_user['user_id'], {'user_github_username' => @github_username}).body['task_id']
 
       task_result = nil
+      user_result = nil
       ticking(polling_interval) do |ticks|
         task_result = api.get_task(task_id).body
         is_finished =
           Mortar::API::Task::STATUSES_COMPLETE.include?(task_result["status_code"])
-        
+        if is_finished
+          user_result = api.get_user().body
+        end
+
         redisplay("Setting github username: %s" % 
           [is_finished ? " Done!" : spinner(ticks)],
           is_finished) # only display newline on last message
@@ -272,6 +276,10 @@ class Mortar::Auth
         raise Mortar::CLI::Errors::InvalidGithubUsername.new
       when Mortar::API::Task::STATUS_SUCCESS
         display "Successfully set github username." 
+
+        if user_result['github_team_state'] == 'pending'
+          display pending_github_team_state_message(user_result['github_accept_invite_url'])
+        end
       else
         #Raise error so .netrc file is wiped out.
         raise RuntimeError, "Unknown task status: #{task_result['status_code']}"

data/lib/mortar/command/base.rb

@@ -451,6 +451,34 @@ protected
     pigscript
   end
 
+  def validate_github_username()
+    user_result = api.get_user().body
+    task_id = api.update_user(user_result['user_id'], {'github_team_state' => true}).body['task_id']
+
+    task_result = nil
+    user_result = nil
+    ticking(polling_interval) do |ticks|
+      task_result = api.get_task(task_id).body
+      is_finished =
+        Mortar::API::Task::STATUSES_COMPLETE.include?(task_result["status_code"])
+      if is_finished
+        user_result = api.get_user().body
+      end
+
+      redisplay("Verifying GitHub username: %s" % 
+        [is_finished ? " Done!" : spinner(ticks)],
+        is_finished) # only display newline on last message
+      if is_finished
+        display
+        break
+      end
+    end
+
+    if user_result['github_team_state'] == 'pending'
+      error(pending_github_team_state_message(user_result['github_accept_invite_url']))
+    end
+  end
+
   def extract_project_in_dir_no_git()
     current_dirs = Dir.glob("*/")
     missing_dir = Mortar::Project::Project.required_directories.find do |required_dir|
@@ -534,7 +562,7 @@ protected
   def default_git_organization
     "mortarcode"
   end
-  
+
   def polling_interval
     (options[:polling_interval] || 2.0).to_f
   end

data/lib/mortar/command/projects.rb

@@ -102,6 +102,8 @@ class Mortar::Command::Projects < Mortar::Command::Base
       ask_public(is_public)
     end 
     validate_project_name(name)
+    validate_github_username
+
     project_id = register_api_call(name,is_public) 
     Mortar::Command::run("generate:project", [name])
     FileUtils.cd(name)
@@ -195,6 +197,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("Usage: mortar projects:clone PROJECT\nMust specify PROJECT.")
     end
     validate_arguments!
+    validate_github_username
     projects = api.get_projects().body["projects"]
     project = projects.find{|p| p['name'] == name}
     unless project
@@ -226,6 +229,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
     end
     validate_arguments!
     validate_project_name(name)
+    validate_github_username
 
     if git.has_dot_git?
       begin

data/lib/mortar/helpers.rb

@@ -526,6 +526,17 @@ module Mortar
       end
     end
 
+    def pending_github_team_state_message(invite_url)
+      """
+\nYour GitHub username has been set, but you must accept GitHub's invitation to 
+join the Mortar GitHub organization.  If you have not received an email you
+can visit #{invite_url} to view and accept your invitation.
+
+You will need to accept this invitation to start using Mortar projects.
+"""
+    end
+
+
     private
 
       def create_display_method(name, colour_code, new_line=true)

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.15.25"
+  VERSION = "0.15.26"
 end

data/spec/mortar/auth_spec.rb

@@ -106,7 +106,7 @@ module Mortar
 
       mock(@cli).ask_for_credentials.returns("username", "apikey")
       stub(@cli).write_credentials
-      mock(@cli.api).get_user() {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com"})}
+      mock(@cli.api).get_user().times(2) {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com"})}
       mock(@cli).ask_for_github_username.returns(new_github_username)
 
       mock(@cli.api).update_user(user_id,{"user_github_username" => new_github_username}) {Excon::Response.new(:body => {"task_id" => task_id})}
@@ -128,7 +128,7 @@ module Mortar
 
       mock(@cli).ask_for_credentials.returns("username", "apikey")
       stub(@cli).write_credentials
-      mock(@cli.api).get_user() {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com"})}
+      mock(@cli.api).get_user().times(2) {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com", "github_team_state" => "active"})}
       mock(@cli).ask_for_github_username.returns(new_github_username)
 
       mock(@cli.api).update_user(user_id,{"user_github_username" => new_github_username}) {Excon::Response.new(:body => {"task_id" => task_id})}

data/spec/mortar/command/projects_spec.rb

@@ -18,7 +18,7 @@ require 'spec_helper'
 require 'fakefs/spec_helpers'
 require 'mortar/command/projects'
 require 'launchy'
-require "mortar/api"
+require 'mortar/api'
 
 
 module Mortar::Command
@@ -92,8 +92,36 @@ STDOUT
     end
     
     context("create") do
+      it "tries to create a project with pending github_team_state" do
+        task_id = "1a2b3c4d5e"
+        user_id = "abcdef"
+        project_name = "some_new_project"
+
+        mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
+
+        mock(Mortar::Auth.api).get_user().times(2) {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com", "github_team_state" => "pending"})}
+
+        mock(Mortar::Auth.api).update_user(user_id,{"github_team_state" => true}) {Excon::Response.new(:body => {"task_id" => task_id})}
+        mock(Mortar::Auth.api).get_task(task_id).returns(Excon::Response.new(:body => {"task_id" => task_id, "status_code" => "SUCCESS"})).ordered
+        
+        stderr, stdout = execute("projects:create #{project_name}", nil, @git)
+        stdout.should == <<-STDOUT
+\r\e[0KVerifying GitHub username:  Done!
+
+STDOUT
+      end
 
       it "registers and generates a project" do
+        task_id = "1a2b3c4d5e"
+        user_id = "abcdef"
+        mock(Mortar::Auth.api).get_user().times(2) {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com", "github_team_state" => "active"})}
+
+        mock(Mortar::Auth.api).update_user(user_id,{"github_team_state" => true}) {Excon::Response.new(:body => {"task_id" => task_id})}
+
+        mock(Mortar::Auth.api).get_task(task_id).returns(Excon::Response.new(:body => {"task_id" => task_id, "status_code" => "QUEUED"})).ordered
+        mock(Mortar::Auth.api).get_task(task_id).returns(Excon::Response.new(:body => {"task_id" => task_id, "status_code" => "PROGRESS"})).ordered
+        mock(Mortar::Auth.api).get_task(task_id).returns(Excon::Response.new(:body => {"task_id" => task_id, "status_code" => "SUCCESS"})).ordered
+
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         project_id = "1234abcd1234abcd1234"
@@ -130,6 +158,8 @@ STDOUT
         File.read("pigscripts/some_new_project.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
 
         stdout.should == <<-STDOUT
+\r\e[0KVerifying GitHub username: /\r\e[0KVerifying GitHub username: -\r\e[0KVerifying GitHub username:  Done!
+
 Sending request to register project: some_new_project... done
 \e[1;32m      create\e[0m  
 \e[1;32m      create\e[0m  README.md
@@ -165,6 +195,13 @@ STDOUT
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
 
+        task_id = "1a2b3c4d5e"
+        user_id = "abcdef"
+        mock(Mortar::Auth.api).get_user().times(2) {Excon::Response.new(:body => {"user_id" => user_id, "user_email" => "foo@foo.com", "github_team_state" => "active"})}
+        mock(Mortar::Auth.api).update_user(user_id,{"github_team_state" => true}) {Excon::Response.new(:body => {"task_id" => task_id})}
+        mock(Mortar::Auth.api).get_task(task_id).returns(Excon::Response.new(:body => {"task_id" => task_id, "status_code" => "SUCCESS"})).ordered
+
+
         project_id = "1234abcd1234abcd1234"
         project_name = "some_new_project"
         project_git_url = "git@github.com:mortarcode-dev/#{project_name}"
@@ -426,6 +463,9 @@ STDERR
       end
       
       it "shows appropriate error message when user tries to clone non-existent project" do
+        any_instance_of(Mortar::Command::Base) do |b|
+          mock(b).validate_github_username.returns(true)
+        end
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         
         stderr, stdout = execute('projects:clone sillyProjectName')
@@ -438,6 +478,9 @@ STDERR
       
       it "shows appropriate error message when user tries to clone into existing directory" do
         with_no_git_directory do
+          any_instance_of(Mortar::Command::Base) do |b|
+            mock(b).validate_github_username.returns(true)
+          end
           mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
           starting_dir = Dir.pwd
           project_dir = File.join(Dir.pwd, project1['name'])
@@ -452,6 +495,9 @@ STDERR
       end
       
       it "calls git clone when existing project is cloned" do
+        any_instance_of(Mortar::Command::Base) do |b|
+          mock(b).validate_github_username.returns(true)
+        end
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         mock(@git).clone(project1['git_url'], project1['name'])
         
@@ -483,6 +529,9 @@ STDERR
       end
 
       it "shows error when in git repo already" do
+        any_instance_of(Mortar::Command::Base) do |b|
+          mock(b).validate_github_username.returns(true)
+        end
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
 
         with_git_initialized_project do |p|           
@@ -494,6 +543,10 @@ STDERR
       end
 
       it "calls correct git commands on success" do
+        any_instance_of(Mortar::Command::Base) do |b|
+          mock(b).validate_github_username.returns(true)
+        end
+
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         project_id = "1234abcd1234abcd1234"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 15
-  - 25
-  version: 0.15.25
+  - 26
+  version: 0.15.26
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-10 00:00:00 Z
+date: 2014-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 8
-        - 6
-        version: 0.8.6
+        - 7
+        version: 0.8.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency