mortar 0.13.2 → 0.13.3

data/lib/mortar/command/base.rb

@@ -132,12 +132,64 @@ class Mortar::Command::Base
       error("Project missing required directories: #{missing_dirs.to_s}")
     end
   end
+  # Register logic 
+  # 
+  # if project id is not created, just pass in nil
+  def register_do(name, is_public, is_embedded, project_id)
+    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
+    
+    if is_embedded
+      validate_project_structure()
+
+      register_project(name, is_public, project_id) do |project_result|
+        initialize_embedded_project(project_result)
+      end
+    else
+      unless git.has_dot_git?
+      # check if we're in the parent directory
+        if File.exists? name
+          error("mortar projects:register must be run from within the project directory.\nPlease \"cd #{name}\" and rerun this command.")
+        else
+          error("No git repository found in the current directory.\nTo register a project that is not its own git repository, use the --embedded option.\nIf you do want this project to be its own git repository, please initialize git in this directory, and then rerun the register command.\nTo initialize your project in git, use:\n\ngit init\ngit add .\ngit commit -a -m \"first commit\"")
+        end
+      end
+
 
-  def register_project(name, is_private)
+      unless git.remotes(git_organization).empty?
+        begin
+          error("Currently in project: #{project.name}.  You can not register a new project inside of an existing mortar project.")
+        rescue Mortar::Command::CommandFailed => cf
+          error("Currently in an existing Mortar project.  You can not register a new project inside of an existing mortar project.")
+        end
+      end
+
+      register_project(name, is_public, project_id) do |project_result|
+        git.remote_add("mortar", project_result['git_url'])
+        git.push_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
+  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)
     action("Sending request to register project: #{name}") do
       project_id = api.post_project(name, is_private).body["project_id"]
     end
+    return project_id
+  end
+
+  def register_project(name, is_public, project_id)
+    'registering project....\n'
+    if project_id == nil      
+      project_id = register_api_call(name, is_public)
+    end
     
     project_result = nil
     project_status = nil

data/lib/mortar/command/projects.rb

@@ -88,23 +88,27 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("Usage: mortar projects:create PROJECTNAME\nMust specify PROJECTNAME")
     end
     
-    Mortar::Command::run("generate:project", [name])
 
-    FileUtils.cd(name)
 
     args = [name,]
+    is_public = false 
     if options[:public]
-      args.push('--public')
+      is_public= true
     end
-
+    validate_project_name(name)
+    project_id = register_api_call(name,is_public) 
+    # is_public is created for clarity in other sections of code
+    Mortar::Command::run("generate:project", [name])
+    FileUtils.cd(name)
+    is_embedded = false
     if options[:embedded]
-      args.push("--embedded")
-      Mortar::Command::run("projects:register", args)
+      is_embedded = true
+      register_do(name, is_public, is_embedded, project_id)
     else
       git.git_init
       git.git("add .")
-      git.git("commit -m \"Mortar project scaffolding\"")
-      Mortar::Command::run("projects:register", args)
+      git.git("commit -m \"Mortar project scaffolding\"")      
+      register_do(name, is_public, is_embedded, project_id)
       display "NOTE: You'll need to change to the new directory to use your project:\n    cd #{name}\n\n"
     end
   end
@@ -123,52 +127,13 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("Usage: mortar projects:register PROJECT\nMust specify PROJECT.")
     end
     validate_arguments!
-
-    if options[: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
-      is_private = false
-    else
-      is_private = true
-    end
-
-    if options[:embedded]
-      validate_project_name(name)
-      validate_project_structure()
-
-      register_project(name, is_private) do |project_result|
-        initialize_embedded_project(project_result)
-      end
-    else
-      unless git.has_dot_git?
-      # check if we're in the parent directory
-        if File.exists? name
-          error("mortar projects:register must be run from within the project directory.\nPlease \"cd #{name}\" and rerun this command.")
-        else
-          error("No git repository found in the current directory.\nTo register a project that is not its own git repository, use the --embedded option.\nIf you do want this project to be its own git repository, please initialize git in this directory, and then rerun the register command.\nTo initialize your project in git, use:\n\ngit init\ngit add .\ngit commit -a -m \"first commit\"")
-        end
-      end
-
-      validate_project_name(name)
-
-      unless git.remotes(git_organization).empty?
-        begin
-          error("Currently in project: #{project.name}.  You can not register a new project inside of an existing mortar project.")
-        rescue Mortar::Command::CommandFailed => cf
-          error("Currently in an existing Mortar project.  You can not register a new project inside of an existing mortar project.")
-        end
-      end
-
-      register_project(name, is_private) do |project_result|
-        git.remote_add("mortar", project_result['git_url'])
-        git.push_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
+    # nil is non existant project_id because it hasn't been posted yet
+    register_do(name, options[:public], options[:embedded], nil) 
+    
   end
   alias_command "register", "projects:register"
 
+
   # projects:set_remote PROJECTNAME
   #
   # Used after you checkout code for an existing Mortar project from a non-Mortar git repository.  
@@ -239,4 +204,52 @@ class Mortar::Command::Projects < Mortar::Command::Base
 
     display "\nYour project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n\n"
   end
+
+
+  # projects:fork GIT_URL PROJECT_NAME
+  #
+  # Used when you want to fork an existing Github repository into your own Mortar project.
+  #
+  # --public      # Register a public project, which can be viewed and forked by anyone.
+  #
+  def fork
+    git_url = shift_argument
+    name = shift_argument
+    unless git_url and name
+      error("Usage: mortar projects:fork GIT_URL PROJECT\nMust specify GIT_URL and PROJECT.")
+    end
+    validate_arguments!
+    validate_project_name(name)
+
+    if git.has_dot_git?
+      begin
+        error("Currently in git repo.  You can not fork a new project inside of an existing git repository.")
+      rescue Mortar::Command::CommandFailed => cf
+        error("Currently in git repo.  You can not fork a new project inside of an existing git repository.")
+      end
+    end
+
+    if options[: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
+      is_public = true
+    else
+      is_public = false
+    end
+
+    git.clone(git_url, name, "base")
+    Dir.chdir(name)
+    # register a nil project id because it hasn't been created yet
+    register_project(name, is_public, nil) do |project_result|
+      git.remote_add("mortar", project_result['git_url'])
+      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")
+      display "Your project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n\n"
+    end
+  end
+  alias_command "fork", "projects:fork"
+
 end

data/lib/mortar/git.rb

@@ -522,8 +522,8 @@ module Mortar
       #
       # clone
       #
-      def clone(git_url, path="")
-        git("clone %s \"%s\"" % [git_url, path], true, false)
+      def clone(git_url, path="", remote_name="origin")
+        git("clone -o %s %s \"%s\"" % [remote_name, git_url, path], true, false)
       end
     end
   end

data/lib/mortar/version.rb

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

data/spec/mortar/command/projects_spec.rb

@@ -93,7 +93,8 @@ STDOUT
     
     context("create") do
 
-      it "generates and registers a project" do
+      it "registers and generates a project" do
+        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"
         project_name = "some_new_project"
@@ -125,6 +126,7 @@ STDOUT
         File.read("pigscripts/some_new_project.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
 
         stdout.should == <<-STDOUT
+Sending request to register project: some_new_project... done
 \e[1;32m      create\e[0m  
 \e[1;32m      create\e[0m  README.md
 \e[1;32m      create\e[0m  .gitignore
@@ -159,7 +161,7 @@ STDOUT
 \e[1;32m      create\e[0m  vendor/udfs/jython/.gitkeep
 \e[1;32m      create\e[0m  vendor/udfs/java
 \e[1;32m      create\e[0m  vendor/udfs/java/.gitkeep
-Sending request to register project: some_new_project... done\n\n\r\e[0KStatus: ACTIVE  \n\nYour project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n
+\n\r\e[0KStatus: ACTIVE  \n\nYour project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n
 NOTE: You'll need to change to the new directory to use your project:
     cd some_new_project
 
@@ -168,12 +170,14 @@ STDOUT
 
       it "generates and registers an embedded project" do
         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"
         project_name = "some_new_project"
         project_git_url = "git@github.com:mortarcode-dev/#{project_name}"
         mock(Mortar::Auth.api).post_project("some_new_project", true) {Excon::Response.new(:body => {"project_id" => project_id})}
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status" => Mortar::API::Projects::STATUS_ACTIVE,
-                                                                                             "git_url" => project_git_url})).ordered
+                                                                                           "git_url" => project_git_url})).ordered
 
         # test that sync_embedded_project is called. the method itself is tested in git_spec.
         mock(@git).sync_embedded_project.with_any_args.times(1) { true }
@@ -239,7 +243,7 @@ STDERR
       it "errors when a project already exists with the name requested" do
         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
         with_git_initialized_project do |p|           
-          stderr, stdout = execute("projects:register Project1", nil, @git)
+          stderr, stdout = execute("projects:register Project1 --embedded", nil, @git)
           stderr.should == <<-STDERR
  !    Your account already contains a project named Project1.
  !    Please choose a different name for your new project, or clone the existing Project1 code using:
@@ -250,7 +254,6 @@ STDERR
       end
 
       it "show appropriate error message when user tries to register a project inside of an existing project" do
-         mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
          with_git_initialized_project do |p|           
            stderr, stdout = execute("projects:register some_new_project", nil, @git)
            stderr.should == <<-STDERR
@@ -261,6 +264,10 @@ STDERR
 
       it "Confirms if user wants to create a public project, exits if not" do
         project_name = "some_new_project"
+        project_id = "1234"
+        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]}))
+        mock(Mortar::Auth.api).post_project("some_new_project", false) {Excon::Response.new(:body => {"project_id" => project_id})}
         any_instance_of(Mortar::Command::Projects) do |base|
           mock(base).ask.with_any_args.times(1) { 'n' }
         end
@@ -464,5 +471,72 @@ STDERR
       end
       
     end
+
+    context("fork") do
+      it "shows correct error message when user doesn't give git_url" do
+        stderr, stdout = execute("projects:fork")
+        stderr.should == <<-STDERR
+ !    Usage: mortar projects:fork GIT_URL PROJECT
+ !    Must specify GIT_URL and PROJECT.
+STDERR
+      end
+
+      it "errors when a project already exists with the name requested" do
+        mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
+        with_git_initialized_project do |p|           
+          stderr, stdout = execute("projects:fork GIT_URL Project1", nil, @git)
+          stderr.should == <<-STDERR
+ !    Your account already contains a project named Project1.
+ !    Please choose a different name for your new project, or clone the existing Project1 code using:
+ !    
+ !    mortar projects:clone Project1
+STDERR
+        end
+      end
+
+      it "shows error when in git repo already" do
+        mock(Mortar::Auth.api).get_projects().returns(Excon::Response.new(:body => {"projects" => [project1, project2]}))
+
+        with_git_initialized_project do |p|           
+          stderr, stdout = execute("projects:fork GIT_URL Project3", nil, @git)
+          stderr.should == <<-STDERR
+ !    Currently in git repo.  You can not fork a new project inside of an existing git repository.
+STDERR
+        end
+      end
+
+      it "calls correct git commands on success" do
+        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"
+        project_name = "some_new_project"
+        project_git_url = "git@github.com:mortarcode-dev/#{project_name}"
+        original_git_url = "git@github.com:mortardata/mortar-recsys-fake"
+
+        mock(Mortar::Auth.api).post_project("some_new_project", false) {Excon::Response.new(:body => {"project_id" => project_id})}
+        status = Mortar::API::Projects::STATUS_ACTIVE
+        response = Excon::Response.new(:body => {"status" => status, "git_url" => project_git_url})
+        mock(Mortar::Auth.api).get_project(project_id).returns(response).ordered
+
+        mock(@git).has_dot_git?().returns(false)
+        mock(@git).clone(original_git_url, project_name, "base")
+        stub(Dir).chdir
+   
+        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")
+        any_instance_of(Mortar::Command::Projects) do |base|
+          mock(base).ask.with_any_args.times(1) { 'y' }
+        end
+
+        stderr, stdout = execute("projects:fork #{original_git_url} #{project_name} --public", nil, @git)
+        stdout.should == <<-STDOUT
+Public projects allow anyone to view and fork the code in this project's repository. Are you sure? (y/n) Sending request to register project: some_new_project... done\n\n\r\e[0KStatus: ACTIVE  \n\nYour project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n
+STDOUT
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.