mortar 0.13.4 → 0.13.5

data/lib/mortar/command/base.rb

@@ -169,13 +169,17 @@ class Mortar::Command::Base
     end
   end
 
-  def register_api_call(name, is_public)
-    project_id = nil
+  def ask_public(is_public)
     if is_public
       unless confirm("Public projects allow anyone to view and fork the code in this project\'s repository. Are you sure? (y/n)")
         error("Mortar project was not registered")
-        end
+      end
     end
+  end
+
+  def register_api_call(name, is_public)
+    project_id = nil
+    
     is_private = !is_public # is private required by restful api
     validate_project_name(name)
     'registering project....\n'

data/lib/mortar/command/projects.rb

@@ -92,6 +92,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
     is_public = false 
     if options[:public]
       is_public= true
+      ask_public(is_public)
     end 
     validate_project_name(name)
     project_id = register_api_call(name,is_public) 
@@ -124,7 +125,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("Usage: mortar projects:register PROJECT\nMust specify PROJECT.")
     end
     validate_arguments!
-
+    ask_public(options[:public])
     #nil is non existant project_id because it hasn't been posted yet
     register_do(name, options[:public], options[:embedded], nil) 
     
@@ -227,7 +228,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
       end
     end
     is_public = options[:public]
-
+    ask_public(is_public)
     git.clone(git_url, name, "base")
     Dir.chdir(name)
     # register a nil project id because it hasn't been created yet
@@ -236,7 +237,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
       git.push_master
       # We want the default remote to be the Mortar managed repo.
       git.git("fetch --all")
-      git.git("branch --set-upstream-to mortar/master")
+      git.set_upstream('mortar/master')
       display "Your project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n\n"
     end
   end

data/lib/mortar/git.rb

@@ -29,16 +29,16 @@ module Mortar
       # core commands
       #
       
-      def has_git?
+      def has_git?(major_version=1, minor_version=7, revision_version=7)
         # Needs to have git version 1.7.7 or greater.  Earlier versions lack 
         # the necessary untracked option for stash.
         git_version_output, has_git = run_cmd("git --version")
         if has_git
           git_version = git_version_output.split(" ")[2]
           versions = git_version.split(".")
-          is_ok_version = versions[0].to_i >= 2 ||
-                          ( versions[0].to_i == 1 && versions[1].to_i >= 8 ) ||
-                          ( versions[0].to_i == 1 && versions[1].to_i == 7 && versions[2].to_i >= 7)
+          is_ok_version = versions[0].to_i >= major_version + 1 ||
+                          ( versions[0].to_i == major_version && versions[1].to_i >= minor_version + 1 ) ||
+                          ( versions[0].to_i == major_version && versions[1].to_i == minor_version && versions[2].to_i >= revision_version)
         end
         has_git && is_ok_version
       end
@@ -465,6 +465,14 @@ module Mortar
         git("remote add #{name} #{url}")
       end
 
+      def set_upstream(remote_branch_name)
+        if has_git?(major_version=1, minor_version=8, revision_version=0)
+          git("branch --set-upstream-to #{remote_branch_name}")
+        else
+          git("branch --set-upstream master #{remote_branch_name}")
+        end
+      end
+
       #
       # rev-parse
       #

data/lib/mortar/version.rb

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

data/spec/mortar/command/projects_spec.rb

@@ -265,7 +265,6 @@ STDERR
       it "Confirms if user wants to create a public project, exits when user says no" do
         project_name = "some_new_project"
         project_id = "1234"
-        mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         any_instance_of(Mortar::Command::Projects) do |base|
           mock(base).ask.with_any_args.times(1) { 'n' }
         end
@@ -523,7 +522,7 @@ STDERR
         mock(@git).remote_add("mortar", project_git_url)
         mock(@git).push_master
         mock(@git).git("fetch --all")
-        mock(@git).git("branch --set-upstream-to mortar/master")
+        mock(@git).set_upstream("mortar/master")
         any_instance_of(Mortar::Command::Projects) do |base|
           mock(base).ask.with_any_args.times(1) { 'y' }
         end

data/spec/mortar/git_spec.rb

@@ -51,6 +51,16 @@ module Mortar
         @git.has_git?.should be_true
       end
 
+      it "returns true with supported version with params" do
+        mock(@git).run_cmd("git --version").returns(["git version 1.8.0", 0])
+        @git.has_git?(major_version=1,minor_version=8,revision_version=0).should be_true
+      end
+
+      it "returns false with unsupported version with params" do
+        mock(@git).run_cmd("git --version").returns(["git version 1.7.12", 0])
+        @git.has_git?(major_version=1,minor_version=8,revision_version=0).should be_false
+      end
+
     end
     
     context "has_any_commits" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc