mortar 0.5.1 → 0.6.0

data/lib/mortar/command/generate.rb

@@ -31,16 +31,14 @@ class Mortar::Command::Generate < Mortar::Command::Base
   def _project
     project_name = shift_argument
     unless project_name
-      error("Usage: mortar new PROJECTNAME\nMust specify PROJECTNAME.")
+      error("Usage: mortar generate:project PROJECTNAME\nMust specify PROJECTNAME.")
     end
     pigscript_name = project_name
     app_generator = Mortar::Generators::ProjectGenerator.new
     app_generator.generate_project(project_name, options)
   end
-  alias_command "new", "generate:_project"
   alias_command "generate:project", "generate:_project"
-
-
+  
   # generate:python_udf [UDFNAME]
   #
   # Generate a new python user defined function

data/lib/mortar/command/jobs.rb

@@ -67,7 +67,6 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #    Run the generate_regression_model_coefficients script on a 3 node cluster.
   #        $ mortar jobs:run generate_regression_model_coefficients --clustersize 3
   def run
-    # arguemnts
     pigscript_name = shift_argument
     unless pigscript_name
       error("Usage: mortar jobs:run PIGSCRIPT\nMust specify PIGSCRIPT.")
@@ -75,8 +74,20 @@ class Mortar::Command::Jobs < Mortar::Command::Base
     validate_arguments!
 
     unless options[:clusterid] || options[:clustersize]
-      options[:clustersize] = 2
-      display("Defaulting to running job on new cluster of size 2")
+      clusters = api.get_clusters().body['clusters']
+
+      largest_free_cluster = clusters.select{ |c| \
+        c['running_job_ids'].length == 0 && c['status_code'] == Mortar::API::Clusters::STATUS_RUNNING }.
+        max_by{|c| c['size']}
+
+      if largest_free_cluster.nil?
+        options[:clustersize] = 2
+        display("Defaulting to running job on new cluster of size 2")
+      else
+        options[:clusterid] = largest_free_cluster['cluster_id']
+        display("Defaulting to running job on largest existing free cluster, id = " + 
+                largest_free_cluster['cluster_id'] + ", size = " + largest_free_cluster['size'].to_s)
+      end
     end
       
     if options[:clusterid]

data/lib/mortar/command/projects.rb

@@ -14,9 +14,13 @@
 # limitations under the License.
 #
 
+require "fileutils"
+
+require "mortar/command"
 require "mortar/command/base"
+require "mortar/git"
 
-# manage projects (create, clone)
+# manage projects (create, register, clone, delete, set_remote)
 #
 class Mortar::Command::Projects < Mortar::Command::Base
   
@@ -34,30 +38,78 @@ class Mortar::Command::Projects < Mortar::Command::Base
     end
   end
   
-  # projects:create PROJECT
+  # projects:delete PROJECTNAME
+  #
+  # Delete a mortar project
+  def delete
+    name = shift_argument
+    unless name
+      error("Usage: mortar projects:delete PROJECTNAME\nMust specify PROJECTNAME.")
+    end
+    validate_arguments!
+    
+    project_id = nil
+    action("Sending request to delete project: #{name}") do
+      api.delete_project(name).body["project_id"]
+    end
+    display "\nYour project has been deleted."
+    
+  end
+  
+  # projects:create PROJECTNAME
   #
-  # create a mortar project for the current directory with the name PROJECT
+  # Generate and register a new Mortar project for code in the current directory, with the name PROJECTNAME.
   def create
     name = shift_argument
     unless name
-      error("Usage: mortar projects:create PROJECT\nMust specify PROJECT.")
+      error("Usage: mortar projects:create PROJECTNAME\nMust specify PROJECTNAME")
+    end
+    
+    Mortar::Command::run("generate:project", [name])
+    FileUtils.cd(name)
+    git.git_init
+    git.git("add .")
+    git.git("commit -m \"Mortar project scaffolding\"")
+    Mortar::Command::run("projects:register", [name])
+    git.git("push mortar master")
+  end
+  alias_command "new", "projects:create"
+  
+  # projects:register PROJECT
+  #
+  # register a mortar project for the current directory with the name PROJECT
+  def register
+    name = shift_argument
+    unless name
+      error("Usage: mortar projects:register PROJECT\nMust specify PROJECT.")
     end
     validate_arguments!
     
     unless git.has_dot_git?
-      error("Can only create a mortar project for an existing git project.  Please run:\n\ngit init\ngit add .\ngit commit -a -m \"first commit\"\n\nto initialize your project in 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.\nPlease initialize a git repository for this project, 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
+    
+    # ensure the project name does not already exist
+    project_names = api.get_projects().body["projects"].collect{|p| p['name']}
+    if project_names.include? name
+      error("Your account already contains a project named #{name}.\nPlease choose a different name for your new project, or clone the existing #{name} code using:\n\nmortar projects:clone #{name}")
     end
     
     unless git.remotes(git_organization).empty?
       begin
-        error("Currently in project: #{project.name}.  You can not create a new project inside of an existing mortar project.")
+        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 create a new project inside of an existing mortar project.")
+        error("Currently in an existing Mortar project.  You can not register a new project inside of an existing mortar project.")
       end
     end
     
     project_id = nil
-    action("Sending request to create project: #{name}") do
+    action("Sending request to register project: #{name}") do
       project_id = api.post_project(name).body["project_id"]
     end
     
@@ -82,7 +134,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
     
     case project_status
     when Mortar::API::Projects::STATUS_FAILED
-      error("Project creation failed.\nError message: #{project_result['error_message']}")
+      error("Project registration failed.\nError message: #{project_result['error_message']}")
     when Mortar::API::Projects::STATUS_ACTIVE
       git.remote_add("mortar", project_result['git_url'])
       display "Your project is ready for use.  Type 'mortar help' to see the commands you can perform on the project.\n\n"
@@ -91,6 +143,7 @@ class Mortar::Command::Projects < Mortar::Command::Base
     end
     
   end
+  alias_command "register", "projects:register"
 
   # projects:set_remote PROJECT
   #

data/lib/mortar/git.rb

@@ -41,6 +41,12 @@ module Mortar
         end
         has_git && is_ok_version
       end
+      
+      def ensure_has_git
+        unless has_git?
+          raise GitError, "git 1.7.7 or higher must be installed"
+        end
+      end
 
       def run_cmd(cmd)
         begin
@@ -54,12 +60,14 @@ module Mortar
       def has_dot_git?
         File.directory?(".git")
       end
+
+      def git_init
+        ensure_has_git
+        run_cmd("git init")
+      end
       
       def git(args, check_success=true, check_git_directory=true)
-        unless has_git?
-          raise GitError, "git 1.7.7 or higher must be installed"
-        end
-        
+        ensure_has_git
         if check_git_directory && !has_dot_git?
           raise GitError, "No .git directory found"
         end

data/lib/mortar/version.rb

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

data/spec/mortar/command/generate_spec.rb

@@ -48,7 +48,7 @@ describe Mortar::Command::Generate do
     it "error when name isn't provided" do
       stderr, stdout = execute("generate:project")
       stderr.should == <<-STDERR
- !    Usage: mortar new PROJECTNAME
+ !    Usage: mortar generate:project PROJECTNAME
  !    Must specify PROJECTNAME.
 STDERR
     end
@@ -79,33 +79,6 @@ STDERR
     end
   end
 
-  describe "new" do
-    it "create new project using alias" do
-      stderr, stdout = execute("new Test")
-      File.exists?("Test").should be_true
-      File.exists?("Test/macros").should be_true
-      File.exists?("Test/fixtures").should be_true
-      File.exists?("Test/pigscripts").should be_true
-      File.exists?("Test/udfs").should be_true
-      File.exists?("Test/README.md").should be_true
-      File.exists?("Test/Gemfile").should be_false
-      File.exists?("Test/macros/.gitkeep").should be_true
-      File.exists?("Test/fixtures/.gitkeep").should be_true
-      File.exists?("Test/pigscripts/Test.pig").should be_true
-      File.exists?("Test/udfs/python/Test.py").should be_true
-
-      File.read("Test/pigscripts/Test.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
-    end
-
-    it "error when name isn't provided" do
-      stderr, stdout = execute("new")
-      stderr.should == <<-STDERR
- !    Usage: mortar new PROJECTNAME
- !    Must specify PROJECTNAME.
-STDERR
-    end
-  end
-
   describe "generate:pigscript" do
     it "Generate a new pigscript in a project" do
       with_blank_project do |p| 

data/spec/mortar/command/jobs_spec.rb

@@ -109,6 +109,7 @@ STDOUT
           job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
           cluster_size = 2
 
+          mock(Mortar::Auth.api).get_clusters() {Excon::Response.new(:body => {'clusters' => []})}
           mock(Mortar::Auth.api).post_job_new_cluster("myproject", "my_script", is_a(String), cluster_size, 
             :parameters => [], 
             :keepalive => true,
@@ -165,6 +166,61 @@ STDOUT
         end
       end
 
+      it "runs a job by default on the largest existing running cluster" do
+        with_git_initialized_project do |p|
+          job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"
+          job_url = "http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5"
+
+          small_cluster_id = '510beb6b3004860820ab6538'
+          small_cluster_size = 2
+          small_cluster_status = Mortar::API::Clusters::STATUS_RUNNING
+          large_cluster_id = '510bf0db3004860820ab6590'
+          large_cluster_size = 5
+          large_cluster_status = Mortar::API::Clusters::STATUS_RUNNING
+          starting_cluster_id = '510bf0db3004860820abaaaa'
+          starting_cluster_size = 10
+          starting_cluster_status = Mortar::API::Clusters::STATUS_STARTING
+          huge_busy_cluster_id = '510bf0db3004860820ab6621'
+          huge_busy_cluster_size = 20
+          huge_busy_cluster_status = Mortar::API::Clusters::STATUS_RUNNING
+          
+
+          mock(Mortar::Auth.api).get_clusters() {
+            Excon::Response.new(:body => { 
+              'clusters' => [
+                  { 'cluster_id' => small_cluster_id, 'size' => small_cluster_size, 'running_job_ids' => [], 'status_code' => small_cluster_status }, 
+                  { 'cluster_id' => large_cluster_id, 'size' => large_cluster_size, 'running_job_ids' => [], 'status_code' => large_cluster_status },
+                  { 'cluster_id' => starting_cluster_id, 'size' => starting_cluster_size, 'running_job_ids' => [], 'status_code' => starting_cluster_status },
+                  { 'cluster_id' => huge_busy_cluster_id, 'size' => huge_busy_cluster_size, 
+                    'running_job_ids' => ['c571a8c7f76a4fd4a67c103d753e2ee6'], 'status_code' => huge_busy_cluster_status  }
+              ]})
+          }
+          mock(Mortar::Auth.api).post_job_existing_cluster("myproject", "my_script", is_a(String), large_cluster_id, 
+            :parameters => [], 
+            :notify_on_job_finish => true) {Excon::Response.new(:body => {"job_id" => job_id, "web_job_url" => job_url})}
+
+          write_file(File.join(p.pigscripts_path, "my_script.pig"))
+          stderr, stdout = execute("jobs:run my_script ", p, @git)
+          stdout.should == <<-STDOUT
+Defaulting to running job on largest existing free cluster, id = 510bf0db3004860820ab6590, size = 5
+Taking code snapshot... done
+Sending code snapshot to Mortar... done
+Requesting job execution... done
+job_id: c571a8c7f76a4fd4a67c103d753e2dd5
+
+Job status can be viewed on the web at:
+
+ http://127.0.0.1:5000/jobs/job_detail?job_id=c571a8c7f76a4fd4a67c103d753e2dd5
+
+Or by running:
+
+  mortar jobs:status c571a8c7f76a4fd4a67c103d753e2dd5 --poll
+
+STDOUT
+
+        end
+      end
+
       it "runs a job with parameter file" do
         with_git_initialized_project do |p|
           job_id = "c571a8c7f76a4fd4a67c103d753e2dd5"

data/spec/mortar/command/projects_spec.rb

@@ -28,6 +28,11 @@ module Mortar::Command
       stub_core      
       @git = Mortar::Git::Git.new
     end
+
+    before("create") do 
+      @tmpdir = Dir.mktmpdir
+      Dir.chdir(@tmpdir)
+    end
     
     project1 = {'name' => "Project1",
                 'status' => Mortar::API::Projects::STATUS_ACTIVE,
@@ -60,41 +65,144 @@ STDOUT
       end
     end
     
+    context("delete") do
+      it "shows error message when user doesn't include project name" do
+        stderr, stdout = execute("projects:delete")
+        stderr.should == <<-STDERR
+ !    Usage: mortar projects:delete PROJECTNAME
+ !    Must specify PROJECTNAME.
+STDERR
+      end
+      
+      it "deletes project" do
+        project_name = "COMMANDO"
+
+        mock(Mortar::Auth.api).delete_project(project_name).returns(Excon::Response.new(:body => {}, :status => 200 )) 
+        stderr, stdout = execute("projects:delete COMMANDO")
+        stdout.should == <<-STDOUT
+Sending request to delete project: COMMANDO... done
+
+Your project has been deleted.
+STDOUT
+      end
+      
+    end
+    
     context("create") do
+
+      it "generates and registers a project" 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).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({})
+        mock(@git).remote_add("mortar", project_git_url)
+
+        # if the git stuff doesn't work, the registration will fail, so we can pretend it does work here
+        mock(@git).git("add .").returns(true)
+        mock(@git).git("commit -m \"Mortar project scaffolding\"").returns(true)
+        mock(@git).git("push mortar master").returns(true)
+
+        stderr, stdout = execute("projects:create #{project_name}", nil, @git)
+        Dir.pwd.end_with?("some_new_project").should be_true
+        File.exists?("macros").should be_true
+        File.exists?("fixtures").should be_true
+        File.exists?("pigscripts").should be_true
+        File.exists?("udfs").should be_true
+        File.exists?("README.md").should be_true
+        File.exists?("Gemfile").should be_false
+        File.exists?("macros/.gitkeep").should be_true
+        File.exists?("fixtures/.gitkeep").should be_true
+        File.exists?("pigscripts/some_new_project.pig").should be_true
+        File.exists?("udfs/python/some_new_project.py").should be_true
+
+        File.read("pigscripts/some_new_project.pig").each_line { |line| line.match(/<%.*%>/).should be_nil }
+
+        stdout.should == <<-STDOUT
+\e[1;32m      create\e[0m  
+\e[1;32m      create\e[0m  README.md
+\e[1;32m      create\e[0m  .gitignore
+\e[1;32m      create\e[0m  pigscripts
+\e[1;32m      create\e[0m  pigscripts/some_new_project.pig
+\e[1;32m      create\e[0m  macros
+\e[1;32m      create\e[0m  macros/.gitkeep
+\e[1;32m      create\e[0m  fixtures
+\e[1;32m      create\e[0m  fixtures/.gitkeep
+\e[1;32m      create\e[0m  udfs
+\e[1;32m      create\e[0m  udfs/python
+\e[1;32m      create\e[0m  udfs/python/some_new_project.py
+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
+    
+    context("register") do
       
       it "show appropriate error message when user doesn't include project name" do
-        stderr, stdout = execute("projects:create")
+        stderr, stdout = execute("projects:register")
         stderr.should == <<-STDERR
- !    Usage: mortar projects:create PROJECT
+ !    Usage: mortar projects:register PROJECT
  !    Must specify PROJECT.
 STDERR
       end
 
-      it "try to create project in directory that doesn't have a git repository" do
+      it "tells you to cd to the directory if one exists with the project name" do
         with_no_git_directory do
-          stderr, stdout = execute("projects:create some_new_project")
+          # create the project, but a level down from current directory
+          project_name = "existing_project_one_level_down"
+          FileUtils.mkdir_p(File.join(Dir.pwd, project_name))
+          stderr, stdout = execute("projects:register #{project_name}")
           stderr.should == <<-STDERR
- !    Can only create a mortar project for an existing git project.  Please run:
+ !    mortar projects:register must be run from within the project directory.
+ !    Please "cd existing_project_one_level_down" and rerun this command.
+STDERR
+        end
+      end
+
+      it "tells you to create the git project in directory that doesn't have a git repository" do
+        with_no_git_directory do
+          stderr, stdout = execute("projects:register some_new_project")
+          stderr.should == <<-STDERR
+ !    No git repository found in the current directory.
+ !    Please initialize a git repository for this project, and then rerun the register command.
+ !    To initialize your project in git, use:
  !    
  !    git init
  !    git add .
  !    git commit -a -m "first commit"
+STDERR
+        end
+      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:register 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:
  !    
- !    to initialize your project in git.
+ !    mortar projects:clone Project1
 STDERR
         end
       end
-      
-      it "show appropriate error message when user tries to create a project inside of an existing project" do
+
+      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:create some_new_project", nil, @git)
+           stderr, stdout = execute("projects:register some_new_project", nil, @git)
            stderr.should == <<-STDERR
- !    Currently in project: myproject.  You can not create a new project inside of an existing mortar project.
+ !    Currently in project: myproject.  You can not register a new project inside of an existing mortar project.
 STDERR
          end
       end
       
-      it "create a new project successfully - with status" do
+      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}"
@@ -108,13 +216,14 @@ STDERR
         mock(@git).remotes.with_any_args.returns({})
         mock(@git).remote_add("mortar", project_git_url)
 
-        stderr, stdout = execute("projects:create #{project_name}  --polling_interval 0.05", nil, @git)
+        stderr, stdout = execute("projects:register #{project_name}  --polling_interval 0.05", nil, @git)
         stdout.should == <<-STDOUT
-Sending request to create project: some_new_project... done\n\n\r\e[0KStatus: PENDING... /\r\e[0KStatus: CREATING... -\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
+Sending request to register project: some_new_project... done\n\n\r\e[0KStatus: PENDING... /\r\e[0KStatus: CREATING... -\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 "create a new project successfully - with status_code and status_description" do
+      it "register a new project successfully - with status_code and status_description" 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}"
@@ -128,9 +237,9 @@ STDOUT
         mock(@git).remotes.with_any_args.returns({})
         mock(@git).remote_add("mortar", project_git_url)
 
-        stderr, stdout = execute("projects:create #{project_name}  --polling_interval 0.05", nil, @git)
+        stderr, stdout = execute("projects:register #{project_name}  --polling_interval 0.05", nil, @git)
         stdout.should == <<-STDOUT
-Sending request to create project: some_new_project... done\n\n\r\e[0KStatus: Pending... /\r\e[0KStatus: Creating... -\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
+Sending request to register project: some_new_project... done\n\n\r\e[0KStatus: Pending... /\r\e[0KStatus: Creating... -\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
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-23 00:00:00 Z
+date: 2013-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mortar-api-ruby
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency