mortar 0.12.6 → 0.13.0

data/lib/mortar/command/base.rb

@@ -133,10 +133,10 @@ class Mortar::Command::Base
     end
   end
 
-  def register_project(name)
+  def register_project(name, is_private)
     project_id = nil
     action("Sending request to register project: #{name}") do
-      project_id = api.post_project(name).body["project_id"]
+      project_id = api.post_project(name, is_private).body["project_id"]
     end
     
     project_result = nil

data/lib/mortar/command/jobs.rb

@@ -60,7 +60,7 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #
   # -c, --clusterid CLUSTERID   # Run job on an existing cluster with ID of CLUSTERID (optional)
   # -s, --clustersize NUMNODES  # Run job on a new cluster, with NUMNODES nodes (optional; must be >= 2 if provided)
-  # -1, --singlejobcluster      # Stop the cluster after job completes.  (Default: false—-cluster can be used for other jobs, and will shut down after 1 hour of inactivity)
+  # -1, --singlejobcluster      # Stop the cluster after job completes.  (Default: false--cluster can be used for other jobs, and will shut down after 1 hour of inactivity)
   # -2, --permanentcluster      # Don't automatically stop the cluster after it has been idle for an hour (Default: false--cluster will be shut down after 1 hour of inactivity)
   # -3, --spot                  # Use spot instances for this cluster (Default: false, only applicable to new clusters)
   # -p, --parameter NAME=VALUE  # Set a pig parameter value in your script.

data/lib/mortar/command/projects.rb

@@ -80,6 +80,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
   # Used when you want to start a new Mortar project using Mortar generated code.
   #
   # --embedded    # Create a Mortar project that is not its own git repo. Your code will still be synced with a git repo in the cloud.
+  # --public      # Register a public project, which can be viewed and forked by anyone.
   #
   def create
     name = shift_argument
@@ -90,13 +91,20 @@ class Mortar::Command::Projects < Mortar::Command::Base
     Mortar::Command::run("generate:project", [name])
 
     FileUtils.cd(name)
+
+    args = [name,]
+    if options[:public]
+      args.push('--public')
+    end
+
     if options[:embedded]
-      Mortar::Command::run("projects:register", [name, "--embedded"])
+      args.push("--embedded")
+      Mortar::Command::run("projects:register", args)
     else
       git.git_init
       git.git("add .")
       git.git("commit -m \"Mortar project scaffolding\"")
-      Mortar::Command::run("projects:register", [name])
+      Mortar::Command::run("projects:register", args)
       display "NOTE: You'll need to change to the new directory to use your project:\n    cd #{name}\n\n"
     end
   end
@@ -107,6 +115,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
   # Used when you want to start a new Mortar project using your existing code in the current directory.
   #
   # --embedded    # Register code that is not its own git repo as a Mortar project. Your code will still be synced with a git repo in the cloud.
+  # --public      # Register a public project, which can be viewed and forked by anyone.
   #
   def register
     name = shift_argument
@@ -115,11 +124,20 @@ class Mortar::Command::Projects < Mortar::Command::Base
     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) do |project_result|
+      register_project(name, is_private) do |project_result|
         initialize_embedded_project(project_result)
       end
     else
@@ -142,7 +160,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
         end
       end
 
-      register_project(name) do |project_result|
+      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"

data/lib/mortar/version.rb

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

data/spec/mortar/command/projects_spec.rb

@@ -98,7 +98,7 @@ STDOUT
         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") {Excon::Response.new(:body => {"project_id" => project_id})}
+        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
         mock(@git).remotes.with_any_args.returns({})
@@ -171,7 +171,7 @@ STDOUT
         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") {Excon::Response.new(:body => {"project_id" => project_id})}
+        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
 
@@ -258,13 +258,49 @@ STDERR
 STDERR
          end
       end
-      
+
+      it "Confirms if user wants to create a public project, exits if not" do
+        project_name = "some_new_project"
+        any_instance_of(Mortar::Command::Projects) do |base|
+          mock(base).ask.with_any_args.times(1) { 'n' }
+        end
+        stderr, stdout = execute("projects:create #{project_name} --public", nil, @git)
+        stderr.should == <<-STDERR
+ !    Mortar project was not registered
+STDERR
+      end
+
+      it "Confirms if user wants to create a public project, creates it if so" do
+        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", 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(true)
+        mock(@git).remotes.with_any_args.returns({})
+        mock(@git).remote_add("mortar", project_git_url)
+        mock(@git).push_master
+        any_instance_of(Mortar::Command::Projects) do |base|
+          mock(base).ask.with_any_args.times(1) { 'y' }
+        end
+
+        stderr, stdout = execute("projects:register #{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
+
+
       it "register a new project successfully - with status" do
         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") {Excon::Response.new(:body => {"project_id" => project_id})}
+        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_PENDING})).ordered
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status" => Mortar::API::Projects::STATUS_CREATING})).ordered
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status" => Mortar::API::Projects::STATUS_ACTIVE,
@@ -286,7 +322,7 @@ STDOUT
         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") {Excon::Response.new(:body => {"project_id" => project_id})}
+        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_description" => "Pending", "status_code" => Mortar::API::Projects::STATUS_PENDING})).ordered
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status_description" => "Creating", "status_code" => Mortar::API::Projects::STATUS_CREATING})).ordered
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status_description" => "Active", "status_code" => Mortar::API::Projects::STATUS_ACTIVE,
@@ -308,7 +344,7 @@ STDOUT
         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") {Excon::Response.new(:body => {"project_id" => project_id})}
+        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_description" => "Pending", "status_code" => Mortar::API::Projects::STATUS_PENDING})).ordered
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status_description" => "Creating", "status_code" => Mortar::API::Projects::STATUS_CREATING})).ordered
         mock(Mortar::Auth.api).get_project(project_id).returns(Excon::Response.new(:body => {"status_description" => "Active", "status_code" => Mortar::API::Projects::STATUS_ACTIVE,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.