kpm 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4006872829cb16464b5567e8ab5d1f58cdb62867
-  data.tar.gz: 5b1db83cc94abdf91430b0fcfe2882616b826d75
+  metadata.gz: 0889ae583673bb8168b34853243ea0e2a88f97e0
+  data.tar.gz: 56ac52db997d07403c2950e673d6677c1c116703
 SHA512:
-  metadata.gz: 541bedab598e86c0a1b09d0a6b64a166525acff629ddef683dac996810f9b1ebd26036ce4d3ea53e1fde85b36c39e1a0b02a2b95bc6583a404712dfbad67a89c
-  data.tar.gz: 9ae353b4d8de4a27444ec8116ba6ed1ae8de7da408b2a0249a86d3497a46455b85d4939713e8b109a84e9b01ce0e9b59a21bf82bc79de2322c23c9ea2f78c04a
+  metadata.gz: 12d0020758ace9cf0ea3de62d2f136f06c8e9ac97a08a8ff7805523f8945b8640e8f2ad2ce3642a3dbb03c53cb578625acc7eb10a9b4650f17bc93c67879bede
+  data.tar.gz: 9d941fbca6145ce2e94cbb5b660b266f07cbab65a2c02077369184e581795f1a76138a7dd55ed63c7591fc1b1a43003c42848e018fdff5c30b14025644d19ad6

data/lib/kpm/base_artifact.rb

@@ -140,7 +140,6 @@ module KPM
       end
 
       def skip_if_exists(artifact_info, coordinates, sha1_file)
-
         # If there is no sha1 from the binary server, we don't skip
         # (Unclear if this is even possible)
         return false if artifact_info[:sha1].nil?
@@ -154,11 +153,16 @@ module KPM
         sha1_checker = Sha1Checker.from_file(sha1_file)
         local_sha1 = sha1_checker.sha1(coordinates)
 
-        # If there is an entry in the sha1_file and it matches the remote, we can skip
-        # Also support convenient 'SKIP' keyword for allowing hacking deployments (dev mode)
-        return true if local_sha1 == artifact_info[:sha1] || local_sha1 == 'SKIP'
+        # Support convenient 'SKIP' keyword for allowing hacking deployments (dev mode)
+        return true if local_sha1 == 'SKIP'
 
-        false
+        if artifact_info[:is_tgz]
+          # For Ruby plugins, if there is an entry in the sha1_file and it matches the remote, we can skip
+          local_sha1 == artifact_info[:sha1]
+        else
+          # For Java plugins and other artifacts, verify the file is still around
+          local_sha1 == artifact_info[:sha1] && File.file?(artifact_info[:file_path])
+        end
       end
 
       def artifact_info(logger, coordinate_map, overrides={}, ssl_verify=true)

data/lib/kpm/installer.rb

@@ -52,8 +52,9 @@ module KPM
     end
 
     def install(force_download=false, verify_sha1=true)
+      bundles_dir = !@config.nil? ? @config['plugins_dir'] : (!@kaui_config.nil? ? @kaui_config['plugins_dir'] : nil)
+      bundles_dir ||= DEFAULT_BUNDLES_DIR
 
-      bundles_dir = @config['plugins_dir'] || DEFAULT_BUNDLES_DIR
       help = nil
       unless @config.nil?
         help = install_tomcat if @config['webapp_path'].nil?

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/kpm/remote/installer_spec.rb

@@ -8,6 +8,36 @@ describe KPM::Installer do
     @logger.level = Logger::INFO
   end
 
+  it 'should be able to install only Kill Bill' do
+    Dir.mktmpdir do |dir|
+      kb_webapp_path   = dir + '/KB_ROOT.war'
+      installer        = KPM::Installer.new({
+                                                'killbill' => {
+                                                    'webapp_path' => kb_webapp_path
+                                                }
+                                            },
+                                            @logger)
+
+      # No exception
+      installer.install.should be_nil
+    end
+  end
+
+  it 'should be able to install only Kaui' do
+    Dir.mktmpdir do |dir|
+      kaui_webapp_path = dir + '/KAUI_ROOT.war'
+      installer        = KPM::Installer.new({
+                                                'kaui' => {
+                                                    'webapp_path' => kaui_webapp_path
+                                                }
+                                            },
+                                            @logger)
+
+      # No exception
+      installer.install.should be_nil
+    end
+  end
+
   it 'should be able to install all artifacts' do
     Dir.mktmpdir do |dir|
       kb_webapp_path   = dir + '/KB_ROOT.war'
@@ -36,7 +66,6 @@ describe KPM::Installer do
                                                 'kaui' => {
                                                     'webapp_path' => kaui_webapp_path
                                                 }
-
                                             },
                                             @logger)
 
@@ -54,14 +83,12 @@ describe KPM::Installer do
 
       info = installer.install_plugin('analytics', nil, nil, nil,  nil, nil, '0.7.1', plugins_dir)
       info[:bundle_dir].should == plugins_dir + '/plugins/java/analytics-plugin/0.7.1'
-
     end
   end
 
   private
 
   def check_installation(plugins_dir, kb_webapp_path, kaui_webapp_path)
-
     [
         plugins_dir,
         plugins_dir + '/platform',
@@ -114,6 +141,5 @@ describe KPM::Installer do
     plugin_identifiers['stripe']['packaging'].should == 'tar.gz'
     plugin_identifiers['stripe']['version'].should == '2.0.0'
     plugin_identifiers['stripe']['language'].should == 'ruby'
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline