lib/kpm/installer.rb in kpm-0.0.12 vs lib/kpm/installer.rb in kpm-0.0.13

@@ -25,19 +25,22 @@
       @nexus_config     = !@config.nil? ? @config['nexus'] : @kaui_config['nexus']
       @nexus_ssl_verify = !@nexus_config.nil? ? @nexus_config['ssl_verify'] : true
     end
 
     def install(force_download=false)
+      @force_download = force_download
+      @bundles_dir = @config['plugins_dir']
+      @sha1_file = "#{@bundles_dir}/#{SHA1_FILENAME}"
+
       unless @config.nil?
         install_killbill_server
         install_plugins
         install_default_bundles
       end
       unless @kaui_config.nil?
         install_kaui
       end
-      @force_download = force_download
     end
 
     private
 
     def install_killbill_server
@@ -50,48 +53,45 @@
 
       KPM::KillbillServerArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, webapp_path, nil, @force_download, @nexus_config, @nexus_ssl_verify)
     end
 
     def install_plugins
-      bundles_dir = @config['plugins_dir']
-      install_java_plugins(bundles_dir)
-      install_ruby_plugins(bundles_dir)
+      install_java_plugins
+      install_ruby_plugins
     end
 
-    def install_java_plugins(bundles_dir)
+    def install_java_plugins
       return if @config['plugins'].nil? or @config['plugins']['java'].nil?
 
       infos = []
       @config['plugins']['java'].each do |plugin|
         group_id    = plugin['group_id'] || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID
         artifact_id = plugin['artifact_id'] || plugin['name']
         packaging   = plugin['packaging'] || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING
         classifier  = plugin['classifier'] || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER
         version     = plugin['version'] || LATEST_VERSION
-        destination = "#{bundles_dir}/plugins/java/#{artifact_id}/#{version}"
-        sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
+        destination = "#{@bundles_dir}/plugins/java/#{artifact_id}/#{version}"
 
-        infos << KPM::KillbillPluginArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, destination, sha1_file, @force_download, @nexus_config, @nexus_ssl_verify)
+        infos << KPM::KillbillPluginArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, destination, @sha1_file, @force_download, @nexus_config, @nexus_ssl_verify)
       end
 
       infos
     end
 
-    def install_ruby_plugins(bundles_dir)
+    def install_ruby_plugins
       return if @config['plugins'].nil? or @config['plugins']['ruby'].nil?
 
       infos = []
       @config['plugins']['ruby'].each do |plugin|
         group_id    = plugin['group_id'] || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID
         artifact_id = plugin['artifact_id'] || plugin['name']
         packaging   = plugin['packaging'] || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING
         classifier  = plugin['classifier'] || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER
         version     = plugin['version'] || LATEST_VERSION
-        destination = "#{bundles_dir}/plugins/ruby"
-        sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
+        destination = "#{@bundles_dir}/plugins/ruby"
 
-        infos << KPM::KillbillPluginArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, destination, sha1_file, @force_download, @nexus_config, @nexus_ssl_verify)
+        infos << KPM::KillbillPluginArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, destination, @sha1_file, @force_download, @nexus_config, @nexus_ssl_verify)
       end
 
       infos
     end
 
@@ -103,14 +103,16 @@
       packaging   = 'tar.gz'
       classifier  = nil
       version     = @config['default_bundles_version'] || LATEST_VERSION
       destination = "#{@config['plugins_dir']}/platform"
 
-      info = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, destination, nil, @force_download, @nexus_config, @nexus_ssl_verify)
+      info = KPM::BaseArtifact.pull(@logger, group_id, artifact_id, packaging, classifier, version, destination, @sha1_file, @force_download, @nexus_config, @nexus_ssl_verify)
 
       # The special JRuby bundle needs to be called jruby.jar
       # TODO .first - code smell
-      File.rename Dir.glob("#{destination}/killbill-platform-osgi-bundles-jruby-*.jar").first, "#{destination}/jruby.jar"
+      if  !info[:skipped]
+        File.rename Dir.glob("#{destination}/killbill-platform-osgi-bundles-jruby-*.jar").first, "#{destination}/jruby.jar"
+      end
 
       info
     end
 
     def install_kaui