mortar 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d5a25dbe99155f562977e533fa2e8b948069aa
-  data.tar.gz: e63af25a7d701b20db21f85e6bd121d8193813ee
+  metadata.gz: 890d6f0f6d9f9171abb6ebafd62d23c70912eca5
+  data.tar.gz: 89ff5f77688e7e4b49d1c5215f3e7186c0f22759
 SHA512:
-  metadata.gz: 85e6825c6f0e3198dca99337a2f0bdc656d3c806f3f1061fbdad81cd1edd1b60f399ef21188b513b8153655bafcfdbcffb8742bb1850037005492f939c4a525d
-  data.tar.gz: 129f36eba0923f01ab3058b83d96f1b6e01e260bf83656f7124a1cc80514c5e27929ecce81c83b0634fac7ef0944dc1b66a23a4c74a615c4002f501da3e026db
+  metadata.gz: 924bc9cafb357195565616fbf77bc91b8aa3b58b9271ff09d7365ad44f2c8e8ebef718180c2d6df77bf7280ea3c1834159d555f52effa5d419a06cff136946a2
+  data.tar.gz: 63812c555e2a84345d3d1b82779dcaac9a4c4d67a18004cfb38e43c17a8263944f1c8bc8a4b04567d2248b313a4dc35fa65147b1b3c1117e5dfda8fe5b93faf7

data/lib/mortar/command/plugins.rb

@@ -31,11 +31,13 @@ module Mortar::Command
       end
     end
 
-    # plugins:install git@github.com:user/repo.git
+    # plugins:install GIT_URL
     #
     # install a plugin
     #
-    #Example:
+    # -b, --branchname BRANCHNAME   # Install plugin from a specific branch.
+    #
+    # Examples:
     #
     # $ mortar plugins:install https://github.com/mortardata/watchtower.git
     # Installing watchtower... done
@@ -47,7 +49,11 @@ module Mortar::Command
       action("Installing #{plugin.name}") do
         begin
           record_usage("plugin_install", plugin.name)
-          plugin.install
+          if options[:branchname]
+            plugin.install(options[:branchname])
+          else
+            plugin.install
+          end
           Mortar::Plugin.load_plugin(plugin.name)
         rescue StandardError => e
           error e.message

data/lib/mortar/local/pig.rb

@@ -23,8 +23,17 @@ class Mortar::Local::Pig
   include Mortar::Local::InstallUtil
 
   PIG_LOG_FORMAT = "humanreadable"
-  PIG_TGZ_NAME = "pig.tgz"
-  PIG_TGZ_DEFAULT_URL_PATH = "resource/pig"
+  PIG_TGZ_NAME = "pig-0.9.tar.gz"
+  PIG_TGZ_DEFAULT_URL_PATH = "resource/pig_0_9"
+  LIB_TGZ_NAME = "lib-common.tar.gz"
+  PIG_COMMON_LIB_URL_PATH = "resource/lib_common"
+
+
+  #This needs to be defined for watchtower.
+  DEFAULT_PIGOPTS_FILES = %w(
+      /lib-common/conf/pig-hawk-global.properties
+      /lib-common/conf/pig-cli-local-dev.properties
+  )
 
   # Tempfile objects have a hook to delete the file when the object is
   # destroyed by the garbage collector.  In practice this means that a
@@ -74,7 +83,11 @@ class Mortar::Local::Pig
   end
 
   def pig_directory
-    return File.join(local_install_directory, "pig")
+    return File.join(local_install_directory, "pig-0.9")
+  end
+
+  def lib_directory
+    return File.join(local_install_directory, "lib-common")
   end
 
   def pig_archive_url
@@ -83,31 +96,55 @@ class Mortar::Local::Pig
     ENV.fetch('PIG_DISTRO_URL', default_url)
   end
 
+  def lib_archive_url
+    full_host  = (host =~ /^http/) ? host : "https://api.#{host}"
+    default_url = full_host + "/" + PIG_COMMON_LIB_URL_PATH
+    ENV.fetch('COMMON_LIB_DISTRO_URL', default_url)
+  end
+
   # Determines if a pig install needs to occur, true if no pig install present
   def should_do_pig_install?
     not (File.exists?(pig_directory))
   end
 
+  def should_do_lib_install?
+    not (File.exists?(lib_directory))
+  end
+
   # Determines if a pig install needs to occur, true if server side
   # pig tgz is newer than date of the existing install
   def should_do_pig_update?
-    return is_newer_version('pig', pig_archive_url)
+    return is_newer_version('pig-0.9', pig_archive_url)
+  end
+
+  def should_do_lib_update?
+    return is_newer_version('lib-common', lib_archive_url)
   end
 
   def install_or_update()
     if should_do_pig_install?
       action "Installing pig to #{local_install_directory_name}" do
-        install()
+        install_pig()
       end
     elsif should_do_pig_update?
       action "Updating to latest pig in #{local_install_directory_name}" do
-        install()
+        install_pig()
+      end
+    end
+
+    if should_do_lib_install?
+      action "Installing pig dependencies to #{local_install_directory_name}" do
+        install_lib()
+      end
+    elsif should_do_lib_update?
+      action "Updating to latest pig dependencies in #{local_install_directory_name}" do
+        install_lib()
       end
     end
   end
 
   # Installs pig for this project if it is not already present
-  def install
+  def install_pig
     FileUtils.mkdir_p(local_install_directory)
     local_tgz = File.join(local_install_directory, PIG_TGZ_NAME)
     download_file(pig_archive_url, local_tgz)
@@ -118,7 +155,17 @@ class Mortar::Local::Pig
     FileUtils.chmod(0755, command)
 
     File.delete(local_tgz)
-    note_install("pig")
+    note_install("pig-0.9")
+  end
+
+  def install_lib
+    FileUtils.mkdir_p(local_install_directory)
+    local_tgz = File.join(local_install_directory, LIB_TGZ_NAME)
+    download_file(lib_archive_url, local_tgz)
+    extract_tgz(local_tgz, local_install_directory)
+
+    File.delete(local_tgz)
+    note_install("lib-common")
   end
 
   def validate_script(pig_script, pig_parameters)
@@ -275,13 +322,22 @@ class Mortar::Local::Pig
     File.expand_path("../../templates/script/runpig.sh", __FILE__)
   end
 
+  def template_params_classpath
+    "#{pig_directory}/*:#{pig_directory}/lib-local/*:#{pig_directory}/lib-pig/*:#{pig_directory}/lib-cluster/*:#{lib_directory}/lib-pig/*:#{lib_directory}/lib-cluster/*:#{jython_directory}/jython.jar:#{lib_directory}/conf/jets3t.properties"
+  end
+
+  def log4j_conf
+   "#{lib_directory}/conf/log4j-cli-local-dev.properties"
+  end
+
   # Parameters necessary for rendering the bash script template
   def pig_command_script_template_parameters(cmd, pig_parameters)
     template_params = {}
     template_params['pig_params_file'] = make_pig_param_file(pig_parameters)
     template_params['pig_home'] = pig_directory
-    template_params['pig_classpath'] = "#{pig_directory}/lib-pig/*:#{jython_directory}/jython.jar"
-    template_params['classpath'] = "#{pig_directory}/lib/*:#{jython_directory}/jython.jar:#{pig_directory}/conf/jets3t.properties"
+    template_params['pig_classpath'] = "#{pig_directory}/lib-local/*:#{pig_directory}/lib-pig/*:#{pig_directory}/lib-cluster/*:#{lib_directory}/lib-pig/*:#{lib_directory}/lib-cluster/*:#{jython_directory}/jython.jar"
+    template_params['classpath'] = template_params_classpath
+    template_params['log4j_conf'] = log4j_conf
     template_params['project_home'] = File.expand_path("..", local_install_directory)
     template_params['local_install_dir'] = local_install_directory
     template_params['pig_sub_command'] = cmd

data/lib/mortar/plugin.rb

@@ -151,20 +151,35 @@ ERROR
       "#{self.class.directory}/#{name}"
     end
 
-    def install
+    def install(branch = nil)
       if File.directory?(path)
         uninstall
       end
       FileUtils.mkdir_p(self.class.directory)
       Dir.chdir(self.class.directory) do
-        git.git("clone #{uri}", check_success=true, check_git_directory=false)
-        unless $?.success?
+        begin
+          git.git("clone #{uri}", check_success=true, check_git_directory=false)
+        rescue Mortar::Git::GitError
           FileUtils.rm_rf path
           raise Mortar::Plugin::ErrorInstallingPlugin, <<-ERROR
 Unable to install plugin #{name}.
 Please check the URL and try again.
 ERROR
         end
+
+        if !!branch
+          Dir.chdir(name) do
+            begin
+              git.git("checkout #{branch}", check_success=true, check_git_directory=true)
+            rescue Mortar::Git::GitError
+              FileUtils.rm_rf path
+              raise Mortar::Plugin::ErrorInstallingPlugin, <<-ERROR
+Unable to checkout branch #{branch} for plugin #{name}.
+Please check the URL and branch and try again.
+ERROR
+            end
+          end
+        end
       end
       install_dependencies
       return true

data/lib/mortar/templates/script/runpig.sh

@@ -15,9 +15,9 @@ cd <%= @project_home %>/pigscripts
 source <%= @local_install_dir %>/pythonenv/bin/activate
 
 # Run Pig
-<%= @local_install_dir %>/pig/bin/pig -exectype local \
-    -log4jconf <%= @local_install_dir %>/pig/conf/log4j-cli-local-dev.properties \
-    -propertyFile <%= @local_install_dir %>/pig/conf/pig-hawk-global.properties \
-    -propertyFile <%= @local_install_dir %>/pig/conf/pig-cli-local-dev.properties \
+<%= @local_install_dir %>/pig-0.9/bin/pig -exectype local \
+    -log4jconf <%= @log4j_conf %> \
+    -propertyFile <%= @local_install_dir %>/lib-common/conf/pig-hawk-global.properties \
+    -propertyFile <%= @local_install_dir %>/lib-common/conf/pig-cli-local-dev.properties \
     -param_file <%= @pig_params_file %> \
     <%= @pig_sub_command %>

data/lib/mortar/version.rb

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

data/spec/mortar/command/local_spec.rb

@@ -152,7 +152,8 @@ PARAMS
           stub(j).check_install.returns(true)
         end
         any_instance_of(Mortar::Local::Pig) do |j|
-          stub(j).install.returns(true)
+          stub(j).install_pig.returns(true)
+          stub(j).install_lib.returns(true)
         end
         any_instance_of(Mortar::Local::Python) do |j|
           stub(j).check_or_install.returns(false)
@@ -166,7 +167,8 @@ PARAMS
           mock(j).check_install.returns(true)
         end
         any_instance_of(Mortar::Local::Pig) do |j|
-          mock(j).install.returns(true)
+          mock(j).install_pig.returns(true)
+          stub(j).install_lib.returns(true)
         end
         any_instance_of(Mortar::Local::Python) do |j|
           mock(j).check_or_install.returns(true)

data/spec/mortar/local/pig_spec.rb

@@ -41,10 +41,10 @@ module Mortar::Local
             FileUtils.touch(local_pig_archive)
           end
           mock(pig).extract_tgz(local_pig_archive, pig.local_install_directory)
-          mock(pig).note_install("pig")
+          mock(pig).note_install("pig-0.9")
           begin
             previous_stdout, $stdout = $stdout, StringIO.new
-            pig.install
+            pig.install_pig
           ensure
             $stdout = previous_stdout
           end
@@ -60,18 +60,25 @@ module Mortar::Local
         pig = Mortar::Local::Pig.new
         mock(pig).should_do_pig_install?.returns(false)
         mock(pig).should_do_pig_update?.returns(false)
+        mock(pig).should_do_lib_install?.returns(false)
+        mock(pig).should_do_lib_update?.returns(false)
         FakeFS do
           FileUtils.mkdir_p(File.dirname(pig.local_install_directory))
           FileUtils.rm_rf(pig.local_install_directory, :force => true)
           pig.install_or_update
-          expect(File.exists?(pig.local_install_directory)).to be_false
+          expect(File.exists?(pig.pig_directory)).to be_false
+          expect(File.exists?(pig.lib_directory)).to be_false
+
         end
       end
 
       it "does install if none has been done before" do
         pig = Mortar::Local::Pig.new
         mock(pig).should_do_pig_install?.returns(true)
-        mock(pig).install
+        mock(pig).should_do_lib_install?.returns(true)
+
+        mock(pig).install_pig
+        mock(pig).install_lib
         capture_stdout do
           pig.install_or_update
         end
@@ -81,7 +88,10 @@ module Mortar::Local
         pig = Mortar::Local::Pig.new
         mock(pig).should_do_pig_install?.returns(false)
         mock(pig).should_do_pig_update?.returns(true)
-        mock(pig).install
+        mock(pig).should_do_lib_install?.returns(false)
+        mock(pig).should_do_lib_update?.returns(true)
+        mock(pig).install_pig
+        mock(pig).install_lib
         capture_stdout do
           pig.install_or_update
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mortar
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Mortar Data
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc