mortar 0.6.1 → 0.6.2

data/lib/mortar/command/describe.rb

@@ -15,13 +15,12 @@
 #
 
 require "mortar/command/base"
-require "mortar/snapshot"
 
 # show data schema for pigscript
 #
 class Mortar::Command::Describe < Mortar::Command::Base
   
-  include Mortar::Snapshot
+  include Mortar::Git
     
   # describe [PIGSCRIPT] [ALIAS]
   #
@@ -43,7 +42,7 @@ class Mortar::Command::Describe < Mortar::Command::Base
     validate_arguments!
     validate_git_based_project!
     pigscript = validate_pigscript!(pigscript_name)
-    git_ref = create_and_push_snapshot_branch(git, project)
+    git_ref = git.create_and_push_snapshot_branch(project)
     
     describe_id = nil
     action("Starting describe") do

data/lib/mortar/command/illustrate.rb

@@ -15,13 +15,12 @@
 #
 
 require "mortar/command/base"
-require "mortar/snapshot"
 
 # sample and show data flowing through a pigscript
 #
 class Mortar::Command::Illustrate < Mortar::Command::Base
   
-  include Mortar::Snapshot
+  include Mortar::Git
     
   # illustrate [PIGSCRIPT] [ALIAS]
   #
@@ -49,7 +48,7 @@ class Mortar::Command::Illustrate < Mortar::Command::Base
     validate_arguments!
     validate_git_based_project!
     pigscript = validate_pigscript!(pigscript_name)
-    git_ref = create_and_push_snapshot_branch(git, project)
+    git_ref = git.create_and_push_snapshot_branch(project)
     
     illustrate_id = nil
     action("Starting illustrate") do

data/lib/mortar/command/jobs.rb

@@ -15,14 +15,13 @@
 #
 
 require "mortar/command/base"
-require "mortar/snapshot"
 require "time"
 
 # run and view status of pig jobs (run, status)
 #
 class Mortar::Command::Jobs < Mortar::Command::Base
 
-  include Mortar::Snapshot
+  include Mortar::Git
 
   # jobs
   #
@@ -77,7 +76,7 @@ class Mortar::Command::Jobs < Mortar::Command::Base
       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 }.
+        c['running_jobs'].length == 0 && c['status_code'] == Mortar::API::Clusters::STATUS_RUNNING }.
         max_by{|c| c['size']}
 
       if largest_free_cluster.nil?
@@ -100,7 +99,7 @@ class Mortar::Command::Jobs < Mortar::Command::Base
  
     validate_git_based_project!
     pigscript = validate_pigscript!(pigscript_name)
-    git_ref = create_and_push_snapshot_branch(git, project)
+    git_ref = git.create_and_push_snapshot_branch(project)
     notify_on_job_finish = ! options[:donotnotify]
     
     # post job to API

data/lib/mortar/command/validate.rb

@@ -15,13 +15,10 @@
 #
 
 require "mortar/command/base"
-require "mortar/snapshot"
 
 # check script syntax
 #
 class Mortar::Command::Validate < Mortar::Command::Base
-  
-  include Mortar::Snapshot
     
   # validate [PIGSCRIPT]
   #
@@ -41,7 +38,7 @@ class Mortar::Command::Validate < Mortar::Command::Base
     validate_arguments!
     validate_git_based_project!
     pigscript = validate_pigscript!(pigscript_name)
-    git_ref = create_and_push_snapshot_branch(git, project)
+    git_ref = git.create_and_push_snapshot_branch(project)
     
     validate_id = nil
     action("Starting validate") do

data/lib/mortar/git.rb

@@ -15,6 +15,7 @@
 #
 
 require "vendor/mortar/uuid"
+require "mortar/helpers"
 require "set"
 
 module Mortar
@@ -91,6 +92,12 @@ module Mortar
         unless has_commits?
           raise GitError, "No commits found in repository.  You must do an initial commit to initialize the repository."
         end
+
+        # Copy code into a temp directory so we don't confuse editors while snapshotting
+        curdir = Dir.pwd
+        tmpdir = Dir.mktmpdir
+        FileUtils.cp_r(Dir.glob('*', File::FNM_DOTMATCH) - ['.', '..'], tmpdir)
+        Dir.chdir(tmpdir)
       
         starting_branch = current_branch
         snapshot_branch = "mortar-snapshot-#{Mortar::UUID.create_random.to_s}"
@@ -122,7 +129,33 @@ module Mortar
           end
         end
       
-        snapshot_branch
+        Dir.chdir(curdir)
+        return tmpdir, snapshot_branch
+      end
+
+      def create_and_push_snapshot_branch(project)
+        curdir = Dir.pwd
+
+        # create a snapshot branch in a temporary directory
+        snapshot_dir, snapshot_branch = Helpers.action("Taking code snapshot") do
+          create_snapshot_branch()
+        end
+
+        Dir.chdir(snapshot_dir)
+
+        git_ref = Helpers.action("Sending code snapshot to Mortar") do
+          # push the code
+          push(project.remote, snapshot_branch)
+
+          # grab the commit hash and clean out the branch from the local branches
+          ref = git_ref(snapshot_branch)
+          branch_delete(snapshot_branch)
+          ref
+        end
+
+        FileUtils.remove_entry_secure(snapshot_dir)
+        Dir.chdir(curdir)
+        return git_ref
       end
 
       #    

data/lib/mortar/version.rb

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

data/spec/mortar/command/jobs_spec.rb

@@ -188,11 +188,12 @@ STDOUT
           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' => small_cluster_id, 'size' => small_cluster_size, 'running_jobs' => [], 'status_code' => small_cluster_status }, 
+                  { 'cluster_id' => large_cluster_id, 'size' => large_cluster_size, 'running_jobs' => [], 'status_code' => large_cluster_status },
+                  { 'cluster_id' => starting_cluster_id, 'size' => starting_cluster_size, 'running_jobs' => [], '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  }
+                    'running_jobs' => [ { 'job_id' => 'c571a8c7f76a4fd4a67c103d753e2dd5',
+                       'job_name' => "", 'start_timestamp' => ""} ], 'status_code' => huge_busy_cluster_status  }
               ]})
           }
           mock(Mortar::Auth.api).post_job_existing_cluster("myproject", "my_script", is_a(String), large_cluster_id, 

data/spec/mortar/git_spec.rb

@@ -262,27 +262,21 @@ STASH
       
       it "creates a snapshot branch for a clean working directory" do
         with_git_initialized_project do |p|
-          starting_status = @git.status
-          snapshot_branch = @git.create_snapshot_branch
-          post_validate_git_snapshot(@git, starting_status, snapshot_branch)
+          create_and_validate_git_snapshot(@git)
         end
       end
       
       it "creates a snapshot branch for an added file" do
         with_git_initialized_project do |p|
           git_add_file(@git, p)
-          starting_status = @git.status
-          snapshot_branch = @git.create_snapshot_branch
-          post_validate_git_snapshot(@git, starting_status, snapshot_branch)
+          create_and_validate_git_snapshot(@git)
         end
       end
       
       it "creates a snapshot branch for an untracked file" do
         with_git_initialized_project do |p|
           git_create_untracked_file(p)
-          starting_status = @git.status
-          snapshot_branch = @git.create_snapshot_branch
-          post_validate_git_snapshot(@git, starting_status, snapshot_branch)
+          create_and_validate_git_snapshot(@git)
         end
       end
       

data/spec/spec_helper.rb

@@ -247,15 +247,31 @@ def git_create_untracked_file(project)
   untracked_file
 end
 
-def post_validate_git_snapshot(git, starting_status, snapshot_branch)
+def create_and_validate_git_snapshot(git)
+  initial_status = git.status
+  initial_git_branches = git.branches
+  snapshot_dir, snapshot_branch = git.create_snapshot_branch
+
+  snapshot_dir.should_not be_nil
   snapshot_branch.should_not be_nil
   snapshot_branch.should_not == "master"
   git.current_branch.should == "master"
-  git.status.should == starting_status
+  git.status.should == initial_status
   git.has_conflicts?.should be_false
+
+  # ensure snapshot is in a temp directory
+  File.exists?(snapshot_dir).should be_true
+
+  curdir = Dir.pwd
+  Dir.chdir(snapshot_dir)
   
   # ensure the snapshot branch exists
   git.git("branch").include?(snapshot_branch).should be_true
+
+  Dir.chdir(curdir)
+  FileUtils.remove_entry_secure(snapshot_dir)
+
+  git.branches.should == initial_git_branches
 end
 
 require "mortar/helpers"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mortar-api-ruby
@@ -190,7 +190,6 @@ files:
 - lib/mortar/git.rb
 - lib/mortar/helpers.rb
 - lib/mortar/project.rb
-- lib/mortar/snapshot.rb
 - lib/mortar/templates/macro/macro.pig
 - lib/mortar/templates/pigscript/pigscript.pig
 - lib/mortar/templates/pigscript/python_udf.py
@@ -221,7 +220,6 @@ files:
 - spec/mortar/git_spec.rb
 - spec/mortar/helpers_spec.rb
 - spec/mortar/project_spec.rb
-- spec/mortar/snapshot_spec.rb
 - spec/mortar/updater_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/mortar/snapshot.rb

@@ -1,39 +0,0 @@
-#
-# Copyright 2012 Mortar Data Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module Mortar
-  module Snapshot
-
-    extend self
-    
-    def create_and_push_snapshot_branch(git, project)
-      # create / push a snapshot branch
-      snapshot_branch = action("Taking code snapshot") do
-        git.create_snapshot_branch()
-      end
-
-      git_ref = action("Sending code snapshot to Mortar") do
-        # push the code
-        git.push(project.remote, snapshot_branch)
-
-        # grab the commit hash and clean out the branch from the local branches
-        ref = git.git_ref(snapshot_branch)
-        git.branch_delete(snapshot_branch)
-        ref
-      end
-    end
-  end
-end

data/spec/mortar/snapshot_spec.rb

@@ -1,46 +0,0 @@
-#
-# Copyright 2012 Mortar Data Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "mortar/helpers"
-
-module Mortar
-  describe Snapshot do
-    include Mortar::Helpers
-    include Mortar::Snapshot
-
-    before(:each) do
-      @git = Mortar::Git::Git.new
-    end
-    
-    it "create and push a snapshot to the remote repository" do
-      with_git_initialized_project do |p|
-        # stub git
-        mock(@git).push("mortar", is_a(String))
-        mock.proxy(@git).create_snapshot_branch
-        
-        stub(self).display
-        
-        initial_git_branches = @git.branches
-        create_and_push_snapshot_branch(@git, p)
-        
-        # ensure that no additional branches are left behind
-        @git.branches.should == initial_git_branches
-      end
-    end
-    
-  end
-end