mortar 0.13.3 → 0.13.4

data/lib/mortar/command/base.rb

@@ -136,12 +136,6 @@ class Mortar::Command::Base
   # 
   # 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()
 
@@ -177,8 +171,14 @@ class Mortar::Command::Base
 
   def register_api_call(name, is_public)
     project_id = nil
+    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
     is_private = !is_public # is private required by restful api
     validate_project_name(name)
+    'registering project....\n'
     action("Sending request to register project: #{name}") do
       project_id = api.post_project(name, is_private).body["project_id"]
     end
@@ -186,7 +186,6 @@ class Mortar::Command::Base
   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

data/lib/mortar/command/projects.rb

@@ -87,17 +87,14 @@ class Mortar::Command::Projects < Mortar::Command::Base
     unless name
       error("Usage: mortar projects:create PROJECTNAME\nMust specify PROJECTNAME")
     end
-    
-
 
     args = [name,]
     is_public = false 
     if options[:public]
       is_public= true
-    end
+    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
@@ -127,7 +124,8 @@ class Mortar::Command::Projects < Mortar::Command::Base
       error("Usage: mortar projects:register PROJECT\nMust specify PROJECT.")
     end
     validate_arguments!
-    # nil is non existant project_id because it hasn't been posted yet
+
+    #nil is non existant project_id because it hasn't been posted yet
     register_do(name, options[:public], options[:embedded], nil) 
     
   end
@@ -208,7 +206,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
 
   # projects:fork GIT_URL PROJECT_NAME
   #
-  # Used when you want to fork an existing Github repository into your own Mortar project.
+  # Used when you want to fork an existing Git repository into your own Mortar project.
   #
   # --public      # Register a public project, which can be viewed and forked by anyone.
   #
@@ -228,15 +226,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
         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
+    is_public = options[:public]
 
     git.clone(git_url, name, "base")
     Dir.chdir(name)

data/lib/mortar/version.rb

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

data/spec/mortar/command/projects_spec.rb

@@ -262,12 +262,10 @@ STDERR
          end
       end
 
-      it "Confirms if user wants to create a public project, exits if not" do
+      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]}))
-        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 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.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to interact with the Mortar service.