mortar 0.2.1 → 0.3.0

data/lib/mortar/command/jobs.rb

@@ -65,7 +65,7 @@ class Mortar::Command::Jobs < Mortar::Command::Base
   #
   #Examples:
   #
-  # $ mortar jobs:run --clustersize 3 geenrate_regression_model_coefficients
+  # $ mortar jobs:run --clustersize 3 generate_regression_model_coefficients
   # 
   #Taking code snapshot... done
   #Sending code snapshot to Mortar... done

data/lib/mortar/generators/project_generator.rb

@@ -22,36 +22,60 @@ module Mortar
       def generate_project(project_name, options)
 
         set_script_binding(project_name, options)
-        mkdir project_name, :verbose => false
-        @dest_path = File.join(@dest_path, project_name)
-        
-        copy_file "README.md", "README.md"
-        copy_file "gitignore", ".gitignore"
-        copy_file "Gemfile", "Gemfile"
-        
-        mkdir "pigscripts"
-        
-        inside "pigscripts" do
-          generate_file "pigscript.pig", "#{project_name}.pig"
-        end
-        
-        mkdir "macros"
-        
-        inside "macros" do
-          copy_file "gitkeep", ".gitkeep"
-        end
-        
-        mkdir "udfs"
-        
-        inside "udfs" do
-          mkdir "python"
-          inside "python" do
-            copy_file "python_udf.py", "#{project_name}.py"
+        #TODO: This needs refactoring.  Too many side effects and unnecessary
+        #complexity.  Just manage the directory structure explicitly.
+        project_path = File.join(@dest_path, project_name)
+        project_already_existed = File.exists?(project_path)
+        begin
+          mkdir project_name, :verbose => false
+          @dest_path = File.join(@dest_path, project_name)
+          
+          copy_file "README.md", "README.md"
+          copy_file "gitignore", ".gitignore"
+          copy_file "Gemfile", "Gemfile"
+          
+          mkdir "pigscripts"
+          
+          inside "pigscripts" do
+            generate_file "pigscript.pig", "#{project_name}.pig"
+          end
+          
+          mkdir "macros"
+          
+          inside "macros" do
+            copy_file "gitkeep", ".gitkeep"
+          end
+          
+          mkdir "udfs"
+          
+          inside "udfs" do
+            mkdir "python"
+            inside "python" do
+              copy_file "python_udf.py", "#{project_name}.py"
+            end
+          end
+          
+          display_run("bundle install")
+          #First verify that we can cd into the project dir. 
+          #The directory change isn't persisted outside of this system command.
+          output = `cd #{project_name}`
+          unless $?.exitstatus == 0
+            raise  Mortar::Command::CommandFailed, output
+          end
+
+          output = `cd #{project_name} && bundle install`
+          unless $?.exitstatus == 0
+            raise  Mortar::Command::CommandFailed, output
+          end
+        rescue => e 
+          #If we can't set up the project correctly and the project folder
+          #didn't exist before - remove it.
+          unless project_already_existed or not File.exists?(project_path)
+            display("\nProject creation failed.  Removing generated files.\n")
+            FileUtils.remove_dir project_path
           end
+          raise e
         end
-        
-        display_run("bundle install")
-        `cd #{project_name} && bundle install && cd ..`
 
       end
 

data/lib/mortar/git.rb

@@ -29,8 +29,26 @@ module Mortar
       #
       
       def has_git?
-        %x{ git --version }
-        $?.success?
+        # 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 >= 1 &&
+                          versions[1].to_i >= 7 &&
+                          versions[2].to_i >= 7
+        end
+        has_git && is_ok_version
+      end
+
+      def run_cmd(cmd)
+        begin
+          output = %x{#{cmd}}
+        rescue Exception => e
+          output = ""
+        end
+        return [output, $?.success?]
       end
       
       def has_dot_git?
@@ -39,7 +57,7 @@ module Mortar
       
       def git(args, check_success=true, check_git_directory=true)
         unless has_git?
-          raise GitError, "git must be installed"
+          raise GitError, "git 1.7.7 or higher must be installed"
         end
         
         if check_git_directory && !has_dot_git?

data/lib/mortar/helpers.rb

@@ -483,6 +483,5 @@ module Mortar
       create_display_method("exists", "1;34")
       create_display_method("identical", "1;34")
       create_display_method("conflict", "1;31")
-
   end
 end

data/lib/mortar/version.rb

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

data/spec/mortar/command/generate_spec.rb

@@ -15,6 +15,7 @@
 #
 
 require "spec_helper"
+require "mortar/generators/generator_base"
 require "mortar/command/generate"
 require "fileutils"
 require "tmpdir"
@@ -42,6 +43,7 @@ describe Mortar::Command::Generate do
 
       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("generate:project")
       stderr.should == <<-STDERR
@@ -49,6 +51,31 @@ describe Mortar::Command::Generate do
  !    Must specify PROJECTNAME.
 STDERR
     end
+
+    it 'removes project directory when generate:project fails' do
+      any_instance_of(Mortar::Generators::Base) do |base|
+        stub(base).copy_file { raise Mortar::Command::CommandFailed, 'Bad Copy'}
+      end
+      begin
+        stderr, stdout = execute("generate:project Test")
+      rescue => e
+        e.message.should == 'Bad Copy'
+      end
+      File.exists?("Test").should be_false
+    end
+
+    it 'does not remove pre-existing project directory when generate:project fails' do
+      FileUtils.mkdir("Test")
+      any_instance_of(Mortar::Generators::Base) do |base|
+        stub(base).copy_file { raise Mortar::Command::CommandFailed, 'Bad Copy'}
+      end
+      begin
+        stderr, stdout = execute("generate:project Test")
+      rescue => e
+        e.message.should == 'Bad Copy'
+      end
+      File.exists?("Test").should be_true
+    end
   end
 
   describe "new" do

data/spec/mortar/git_spec.rb

@@ -24,6 +24,22 @@ module Mortar
       @git = Mortar::Git::Git.new
     end
     
+    context "has_git?" do
+      it "returns false with no git installed" do
+        mock(@git).run_cmd("git --version").returns("-bash: git: command not found")
+        @git.has_git?.should be_false
+      end
+
+      it "returns false with unsupported git version" do
+        mock(@git).run_cmd("git --version").returns("git version 1.7.6")
+        @git.has_git?.should be_false
+      end
+
+      it "returns false with unsupported git version" do
+        @git.has_git?.should be_true
+      end
+
+    end
     
     context "has_any_commits" do
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 Z
+date: 2012-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mortar-api-ruby
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency