kpm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6819019089d4dd3219f4e68c7a55323addf194fe
-  data.tar.gz: 47f1774f8355f87424fab114b6bad542159a9beb
+  metadata.gz: 22516ceff283bc4c4aff7ecb2f414f7def89aac7
+  data.tar.gz: edce716c37b92e06753419183c1a1011e9a2bd80
 SHA512:
-  metadata.gz: e383b778cb444ede8ec0b1e4172f600fea63c47ee8b24e7f015727f68ff220cdb0fcdcca2dbd8f420f7c7e7b68909874155923bfb1c941bb7426a1b8d1b29db0
-  data.tar.gz: ee4fb38ad9686232f9302c892b7c1583698faee0c2cd582929bba9e0c5c0e55c26feb888b4f9eb66e0f8c8f27de1e6dc576b2996b3b27138922feff8b64b1e38
+  metadata.gz: ed3db5d0b475cfe96ecabe07f0b56a3dc28c74cd46a30f7377536756cf63865120c6744614154edf02562e1ee0d8a8fb1f4159d830c84a9a98d3ef78df088c99
+  data.tar.gz: c185b075be6bc768a5f6ac4c72c86b29249b7f47d8e0c926983a01ce12ad6f47b13df1e8884f2ab66346529a926459d11f30dd34a37b87087b053bc5d12ccf6a

data/lib/kpm/base_installer.rb

@@ -62,61 +62,67 @@ module KPM
     end
 
 
-    def install_plugin(plugin_key, specified_group_id, specified_artifact_id, specified_packaging=nil, specified_classifier=nil, specified_version=nil, bundles_dir=nil, specified_type='java', force_download=false, verify_sha1=true)
 
+    def install_plugin(plugin_key, specified_group_id=nil, specified_artifact_id=nil, specified_packaging=nil, specified_classifier=nil, specified_version=nil, bundles_dir=nil, specified_type=nil, force_download=false, verify_sha1=true)
+
+      # plugin_key needs to exist
       if plugin_key.nil?
         @logger.warn("Aborting installation: User needs to specify a pluginKey")
         return nil
       end
 
-      # Since we allow to only specify a the artifact_id to identify a given plugin we set the default on the other fields
-      specified_group_id = specified_group_id || (specified_type.to_s == 'java' ? KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID : KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID)
-      specified_packaging = specified_packaging || (specified_type.to_s == 'java' ? KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING : KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING)
-      specified_classifier = specified_classifier || (specified_type.to_s == 'java' ? KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER : KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER)
-
-      # Create a Proc to validate and resolve arguments
-      resolve_and_validate_args_proc = Proc.new { |plugin_key, arg_type, specified_arg, lookup_arg|
-
-        # There is an entry in plugin_directory.yml but does not match with input
-        if lookup_arg && specified_arg && lookup_arg.to_s != specified_arg.to_s
-          @logger.warn("Aborting installation: User specified #{arg_type}=#{specified_arg} for pluginKey = #{plugin_key}, but plugin_directory.yml resolves with #{lookup_arg}")
-          return nil
-        end
 
-        # There is no entry and user did not specify anything (or we did not have any default)
-        if lookup_arg.nil? && specified_arg.nil?
-          @logger.warn("Aborting installation: need to specify an #{arg_type} for pluginKey = #{plugin_key}")
-          return nil
-        end
-        # If validation is successful we return resolved value
-        specified_arg || lookup_arg
-      }
-
-
-      # Lookup entry (will come with null everywhere if entry does not exist in plugin_directory.yml)
+      # Lookup artifact and perform validation against input
       looked_up_group_id, looked_up_artifact_id, looked_up_packaging, looked_up_classifier, looked_up_version, looked_up_type = KPM::PluginsDirectory.lookup(plugin_key, true)
-
-      # If there is no entry in plugins_directory.yml, the key provided must be a user key and must have a namespace
-      if looked_up_artifact_id.nil? && plugin_key.split(':').size == 1
+      return if !validate_installation_arg(plugin_key, 'group_id', specified_group_id, looked_up_group_id)
+      return if !validate_installation_arg(plugin_key, 'artifact_id', specified_artifact_id, looked_up_artifact_id)
+      return if !validate_installation_arg(plugin_key, 'packaging', specified_packaging, looked_up_packaging)
+      return if !validate_installation_arg(plugin_key, 'type', specified_type, looked_up_type)
+      return if !validate_installation_arg(plugin_key, 'classifier', specified_classifier, looked_up_classifier)
+
+
+      # If there is no entry in plugins_directory.yml and the group_id is not the killbill default group_id, the key provided must be a user key and must have a namespace
+      if looked_up_artifact_id.nil? &&
+          specified_group_id != KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID &&
+          specified_group_id != KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID &&
+          plugin_key.split(':').size == 1
         @logger.warn("Aborting installation: pluginKey = #{plugin_key} does not exist in plugin_directory.yml so format of the key must have a user namespace (e.g namespace:key)")
         return nil
       end
 
-      # Validate and resolve the value to use (user input has precedence)
-      group_id = resolve_and_validate_args_proc.call(plugin_key, 'group_id', specified_group_id, looked_up_group_id)
-      artifact_id = resolve_and_validate_args_proc.call(plugin_key, 'artifact_id', specified_artifact_id, looked_up_artifact_id)
-      packaging = resolve_and_validate_args_proc.call(plugin_key, 'packaging', specified_packaging, looked_up_packaging)
-      classifier = specified_classifier || looked_up_classifier
-      type = resolve_and_validate_args_proc.call(plugin_key, 'type', specified_type, looked_up_type).to_s
-      version = specified_version || looked_up_version || LATEST_VERSION
+
+      # Specified parameters have always precedence except for the artifact_id (to map stripe to stripe-plugin)
+      artifact_id = looked_up_artifact_id || specified_artifact_id
+      if artifact_id.nil?
+        @logger.warn("Aborting installation: unable to lookup plugin #{specified_artifact_id}")
+        return nil
+      end
 
       bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
       plugins_dir = bundles_dir.join('plugins')
 
-      destination = type == 'java' ? plugins_dir.join('java').join(artifact_id).join(version) : plugins_dir.join('ruby')
-
+      type = specified_type || looked_up_type
+      if type.to_s == 'java'
+        group_id = specified_group_id || looked_up_group_id || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_GROUP_ID
+        packaging = specified_packaging || looked_up_packaging || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_PACKAGING
+        classifier = specified_classifier || looked_up_classifier || KPM::BaseArtifact::KILLBILL_JAVA_PLUGIN_CLASSIFIER
+        version = specified_version || looked_up_version || LATEST_VERSION
+        destination = plugins_dir.join('java').join(artifact_id).join(version)
+      else
+        group_id = specified_group_id || looked_up_group_id || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_GROUP_ID
+        packaging = specified_packaging || looked_up_packaging || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_PACKAGING
+        classifier = specified_classifier || looked_up_classifier || KPM::BaseArtifact::KILLBILL_RUBY_PLUGIN_CLASSIFIER
+        version = specified_version || looked_up_version || LATEST_VERSION
+        destination = plugins_dir.join('ruby')
+      end
       sha1_file = "#{bundles_dir}/#{SHA1_FILENAME}"
 
+
+      # Before we do the install we verify that the entry we have in the plugin_identifiers.json matches our current request
+      coordinates = [group_id, artifact_id, packaging, classifier, version]
+      return if !validate_plugin_key(plugins_dir, plugin_key, coordinates)
+
+
       @logger.debug("Installing plugin: group_id=#{group_id} artifact_id=#{artifact_id} packaging=#{packaging} classifier=#{classifier} version=#{version} destination=#{destination}")
       artifact_info = KPM::KillbillPluginArtifact.pull(@logger,
                                                        group_id,
@@ -130,14 +136,15 @@ module KPM
                                                        verify_sha1,
                                                        @nexus_config,
                                                        @nexus_ssl_verify)
+
       mark_as_active(plugins_dir, artifact_info, artifact_id)
-      update_plugin_identifier(plugins_dir, plugin_key, artifact_info)
+
+      update_plugin_identifier(plugins_dir, plugin_key, type.to_s, coordinates, artifact_info)
 
       artifact_info
     end
 
 
-
     def install_plugin_from_fs(plugin_key, file_path, name, version, bundles_dir=nil, type='java')
       bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
       plugins_dir = bundles_dir.join('plugins')
@@ -152,11 +159,30 @@ module KPM
       artifact_info[:version] ||= version
 
       mark_as_active(plugins_dir, artifact_info)
-      update_plugin_identifier(plugins_dir, plugin_key, artifact_info)
+
+      update_plugin_identifier(plugins_dir, plugin_key, type.to_s, nil, artifact_info)
 
       artifact_info
     end
 
+    def uninstall_plugin(plugin_key, plugin_version=nil, bundles_dir=nil)
+
+      bundles_dir = Pathname.new(bundles_dir || DEFAULT_BUNDLES_DIR).expand_path
+      plugins_dir = bundles_dir.join('plugins')
+
+      plugins_manager = PluginsManager.new(plugins_dir, @logger)
+
+      plugin_name = plugins_manager.get_plugin_name_from_key(plugin_key)
+      if plugin_name.nil?
+        @logger.warn("Cannot uninstall plugin: Unknown plugin_key = #{plugin_key}");
+        return
+      end
+
+      modified = plugins_manager.uninstall(plugin_name, plugin_version)
+      plugins_manager.remove_plugin_identifier_key(plugin_key)
+      modified
+    end
+
     def install_default_bundles(bundles_dir, specified_version=nil, kb_version=nil, force_download=false, verify_sha1=true)
       group_id = 'org.kill-bill.billing'
       artifact_id = 'killbill-platform-osgi-bundles-defaultbundles'
@@ -199,18 +225,34 @@ module KPM
 
     private
 
-    def update_plugin_identifier(plugins_dir, plugin_key, artifact_info)
-      # In case the artifact on disk already existed and the installation is skipped, we don't try to update the pluginKey mapping
-      # (of course if the install is retried with a different pluginKey that may be confusing for the user)
-      if artifact_info[:bundle_dir].nil?
-        @logger.info("Skipping updating plugin identifier for already installed plugin")
-        return
+    def validate_installation_arg(plugin_key, arg_type, specified_arg, looked_up_arg)
+
+      # If nothing was specified, or if we don't find anything from the lookup, nothing to validate against
+      if specified_arg.nil? || looked_up_arg.nil?
+        return true
       end
 
+      if specified_arg.to_s != looked_up_arg.to_s
+        @logger.warn("Aborting installation for plugin_key #{plugin_key}: specified value #{specified_arg} for #{arg_type} does not match looked_up value #{looked_up_arg}")
+        return false
+      end
+
+      true
+    end
+
+    def validate_plugin_key(plugins_dir, plugin_key, coordinates)
+      plugins_manager = PluginsManager.new(plugins_dir, @logger)
+      return plugins_manager.validate_plugin_identifier_key(plugin_key, coordinates)
+    end
+
+    def update_plugin_identifier(plugins_dir, plugin_key, type, coordinates, artifact_info)
+      # In case the artifact on disk already existed and the installation is skipped, info[:bundle_dir] is null but the path exists in info[:dir_name]
+      path = artifact_info[:bundle_dir] || artifact_info[:dir_name]
+
       # The plugin_name needs to be computed after the fact (after the installation) because some plugin archive embed their directory structure
-      plugin_name = Pathname.new(artifact_info[:bundle_dir]).parent.split[1].to_s
+      plugin_name = Pathname.new(path).parent.split[1].to_s
       plugins_manager = PluginsManager.new(plugins_dir, @logger)
-      plugins_manager.update_plugin_identifier(plugin_key, plugin_name)
+      plugins_manager.add_plugin_identifier_key(plugin_key, plugin_name, type, coordinates)
     end
 
     def mark_as_active(plugins_dir, artifact_info, artifact_id=nil)

data/lib/kpm/plugins_manager.rb

@@ -17,7 +17,7 @@ module KPM
 
       if plugin_version.nil?
         # Full path specified, with version
-        link = Pathname.new(plugin_name_or_path).join('../ACTIVE')
+        link = Pathname.new(plugin_name_or_path).join('../SET_DEFAULT')
         FileUtils.rm_f(link)
         FileUtils.ln_s(plugin_name_or_path, link, :force => true)
       else
@@ -26,14 +26,14 @@ module KPM
         # Only one should match (java or ruby plugin)
         Dir.glob(plugin_dir_glob).each do |plugin_dir_path|
           plugin_dir = Pathname.new(plugin_dir_path)
-          link = plugin_dir.join('ACTIVE')
+          link = plugin_dir.join('SET_DEFAULT')
           FileUtils.rm_f(link)
           FileUtils.ln_s(plugin_dir.join(plugin_version), link, :force => true)
         end
       end
 
       update_fs(plugin_name_or_path, plugin_version) do |tmp_dir|
-        FileUtils.rm_f(tmp_dir.join('stop.txt'))
+        FileUtils.rm_f(tmp_dir.join('disabled.txt'))
         FileUtils.rm_f(tmp_dir.join('restart.txt'))
       end
     end
@@ -42,44 +42,72 @@ module KPM
       update_fs(plugin_name_or_path, plugin_version) do |tmp_dir|
         FileUtils.rm_f(tmp_dir.join('restart.txt'))
         # Be safe, keep the code, just never start it
-        FileUtils.touch(tmp_dir.join('stop.txt'))
+        FileUtils.touch(tmp_dir.join('disabled.txt'))
       end
     end
 
     def restart(plugin_name_or_path, plugin_version=nil)
       update_fs(plugin_name_or_path, plugin_version) do |tmp_dir|
-        # Remove stop.txt so that the plugin is started if it was stopped
-        FileUtils.rm_f(tmp_dir.join('stop.txt'))
+        # Remove disabled.txt so that the plugin is started if it was stopped
+        FileUtils.rm_f(tmp_dir.join('disabled.txt'))
         FileUtils.touch(tmp_dir.join('restart.txt'))
       end
     end
 
-    def update_plugin_identifier(plugin_key, plugin_name)
-      path = Pathname.new(@plugins_dir).join('plugin_identifiers.json')
-      backup_path = Pathname.new(path.to_s + ".back")
+    def validate_plugin_identifier_key(plugin_key, coordinates)
 
-      identifiers = {}
-      begin
-        identifiers = File.open(path, 'r') do |f|
-          JSON.parse(f.read)
+      identifiers = read_plugin_identifiers
+      entry = identifiers[plugin_key]
+      if entry
+        [:group_id, :artifact_id, :packaging, :classifier, :version].each_with_index do |value_type, idx|
+          return false if !validate_plugin_identifier_key_value(plugin_key, value_type, entry[value_type.to_s], coordinates[idx])
         end
-        # Move file in case something happens until we complete the operation
-        FileUtils.mv(path, backup_path)
-      rescue Errno::ENOENT
       end
+      true
+    end
+
+    def add_plugin_identifier_key(plugin_key, plugin_name, language, coordinates)
 
-      identifiers[plugin_key] = plugin_name
-      File.open(path, 'w') do |f|
-        f.write(identifiers.to_json)
+      identifiers = read_plugin_identifiers
+      # If key does not already exists we update it, if not nothing to do
+      if !identifiers.has_key?(plugin_key)
+
+        entry = {'plugin_name' => plugin_name}
+        entry['language'] = language
+        if coordinates
+          entry['group_id'] = coordinates[0]
+          entry['artifact_id'] = coordinates[1]
+          entry['packaging'] = coordinates[2]
+          entry['classifier'] = coordinates[3]
+          entry['version'] = coordinates[4]
+        end
+        identifiers[plugin_key] = entry
+        write_plugin_identifiers(identifiers)
       end
 
-      # Cleanup backup entry
-      FileUtils.rm(backup_path, :force => true)
+      identifiers
+    end
+
+    def remove_plugin_identifier_key(plugin_key)
+
+      identifiers = read_plugin_identifiers
+      # If key does not already exists we update it, if not nothing to do.
+      if identifiers.has_key?(plugin_key)
+        identifiers.delete(plugin_key)
+        write_plugin_identifiers(identifiers)
+      end
 
       identifiers
     end
 
 
+    def get_plugin_name_from_key(plugin_key)
+      identifiers = read_plugin_identifiers
+      return nil if identifiers.nil? || !identifiers.has_key?(plugin_key)
+      identifiers[plugin_key]['plugin_name']
+    end
+
+
     def guess_plugin_name(artifact_id)
       return nil if artifact_id.nil?
       captures = artifact_id.scan(/(.*)-plugin/)
@@ -103,6 +131,42 @@ module KPM
 
     private
 
+    def validate_plugin_identifier_key_value(plugin_key, value_type, entry_value, coordinate_value)
+      # The json does not contain the coordinates (case when installed from install_plugin_from_fs)
+      return true if entry_value.nil?
+
+      if entry_value != coordinate_value
+        @logger.warn("Entry in plugin_identifiers.json for key #{plugin_key} does not match for coordinate #{value_type}: got #{coordinate_value} instead of #{entry_value}")
+        return false
+      end
+      true
+    end
+
+    def read_plugin_identifiers
+      path = Pathname.new(@plugins_dir).join('plugin_identifiers.json')
+      identifiers = {}
+      begin
+        identifiers = File.open(path, 'r') do |f|
+          JSON.parse(f.read)
+        end
+      rescue Errno::ENOENT
+      end
+      identifiers
+    end
+
+    def write_plugin_identifiers(identifiers)
+
+      path = Pathname.new(@plugins_dir).join('plugin_identifiers.json')
+      Dir.mktmpdir do |tmp_dir|
+        tmp_path = Pathname.new(tmp_dir).join('plugin_identifiers.json')
+        File.open(tmp_path, 'w') do |f|
+          f.write(identifiers.to_json)
+        end
+
+        FileUtils.mv(tmp_path, path)
+      end
+    end
+
     # Note: the plugin name here is the directory name on the filesystem
     def update_fs(plugin_name_or_path, plugin_version=nil, &block)
       if plugin_name_or_path.nil?

data/lib/kpm/version.rb

@@ -1,3 +1,3 @@
 module KPM
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/kpm/remote/installer_spec.rb

@@ -21,28 +21,17 @@ describe KPM::Installer do
                                                         'java' => [{
                                                                        'name' => 'analytics',
                                                                        'version' => '0.7.1'
-                                                                   },
-                                                                   # Re-add a second time the same plugin to validate the idempotency of installation
-                                                                   {
-                                                                       'name' => 'analytics',
-                                                                       'version' => '0.7.1'
                                                                    }],
                                                         'ruby' => [{
-                                                                       'name' => 'killbill:payment-test-plugin',
+                                                                       'name' => 'payment-test-plugin',
                                                                        'artifact_id' => 'payment-test-plugin',
+                                                                       'group_id' => 'org.kill-bill.billing.plugin.ruby',
                                                                        'version' => '1.8.7'
                                                                    },
                                                                    {
                                                                        'name' => 'stripe'
-                                                                   },
-                                                                   # Re-add a second time the same plugin to validate the idempotency of installation
-                                                                   {
-                                                                       'name' => 'killbill:payment-test-plugin',
-                                                                       'artifact_id' => 'payment-test-plugin',
-                                                                       'version' => '1.8.7'
-                                                                   }
-                                                        ]
-                                                    },
+                                                                   }]
+                                                    }
                                                 },
                                                 'kaui' => {
                                                     'webapp_path' => kaui_webapp_path
@@ -95,9 +84,27 @@ describe KPM::Installer do
     end
 
     plugin_identifiers.size.should == 3
-    plugin_identifiers['killbill:payment-test-plugin'].should == 'killbill-payment-test'
-    plugin_identifiers['stripe'].should == 'killbill-stripe'
-    plugin_identifiers['analytics'].should == 'analytics-plugin'
+
+    plugin_identifiers['analytics']['plugin_name'].should == 'analytics-plugin'
+    plugin_identifiers['analytics']['group_id'].should == 'org.kill-bill.billing.plugin.java'
+    plugin_identifiers['analytics']['artifact_id'].should == 'analytics-plugin'
+    plugin_identifiers['analytics']['packaging'].should == 'jar'
+    plugin_identifiers['analytics']['version'].should == '0.7.1'
+    plugin_identifiers['analytics']['language'].should == 'java'
+
+    plugin_identifiers['payment-test-plugin']['plugin_name'].should == 'killbill-payment-test'
+    plugin_identifiers['payment-test-plugin']['group_id'].should == 'org.kill-bill.billing.plugin.ruby'
+    plugin_identifiers['payment-test-plugin']['artifact_id'].should == 'payment-test-plugin'
+    plugin_identifiers['payment-test-plugin']['packaging'].should == 'tar.gz'
+    plugin_identifiers['payment-test-plugin']['version'].should == '1.8.7'
+    plugin_identifiers['payment-test-plugin']['language'].should == 'ruby'
+
+    plugin_identifiers['stripe']['plugin_name'].should == 'killbill-stripe'
+    plugin_identifiers['stripe']['group_id'].should == 'org.kill-bill.billing.plugin.ruby'
+    plugin_identifiers['stripe']['artifact_id'].should == 'stripe-plugin'
+    plugin_identifiers['stripe']['packaging'].should == 'tar.gz'
+    plugin_identifiers['stripe']['version'].should == '2.0.0'
+    plugin_identifiers['stripe']['language'].should == 'ruby'
 
   end
 end

data/spec/kpm/unit/plugins_manager_spec.rb

@@ -14,54 +14,119 @@ describe KPM::PluginsManager do
     FileUtils.mkdir_p(@plugin_dir.join('1.0.0'))
     FileUtils.mkdir_p(@plugin_dir.join('2.0.0'))
 
-    File.exists?(@plugin_dir.join('ACTIVE')).should be_false
+    File.exists?(@plugin_dir.join('SET_DEFAULT')).should be_false
   end
 
   after(:each) do
     FileUtils.remove_entry_secure @plugins_dir
   end
 
+  it 'creates a plugin identifier entry with no coordinate' do
+    # Verifies file gets created if does not exist
+    identifiers = @manager.add_plugin_identifier_key('foo', 'foo_name', 'type', nil)
+    identifiers.size.should == 1
+    identifiers['foo']['plugin_name'].should == 'foo_name'
+  end
+
+  it 'creates a plugin identifier entry with coordinates' do
+    # Verifies file gets created if does not exist
+    identifiers = @manager.add_plugin_identifier_key('bar', 'bar_name', 'type', ['group', 'artifact', 'packaging', nil, 'version'])
+    identifiers.size.should == 1
+    identifiers['bar']['plugin_name'].should == 'bar_name'
+    identifiers['bar']['group_id'].should == 'group'
+    identifiers['bar']['artifact_id'].should == 'artifact'
+    identifiers['bar']['packaging'].should == 'packaging'
+    identifiers['bar']['classifier'].should == nil
+    identifiers['bar']['version'].should == 'version'
+  end
+
 
-  it 'it creates a plugin identifiers file and add entries' do
+  it 'creates plugin identifier with multiple entries' do
     # Verifies file gets created if does not exist
-    identifiers = @manager.update_plugin_identifier('foo', 'foo_name')
+    identifiers = @manager.add_plugin_identifier_key('foo', 'foo_name', 'type', nil)
     identifiers.size.should == 1
-    identifiers['foo'].should == 'foo_name'
+    identifiers['foo']['plugin_name'].should == 'foo_name'
 
     # Verify file was created from previous entry (prev value was read)
-    identifiers = @manager.update_plugin_identifier('bar', 'bar_name')
+    identifiers = @manager.add_plugin_identifier_key('bar', 'bar_name', 'type', nil)
     identifiers.size.should == 2
-    identifiers['foo'].should == 'foo_name'
-    identifiers['bar'].should == 'bar_name'
+    identifiers['foo']['plugin_name'].should == 'foo_name'
+    identifiers['bar']['plugin_name'].should == 'bar_name'
 
 
     # Verify file was created from previous entry (prev value was read)
-    identifiers = @manager.update_plugin_identifier('zoe', 'zoe_name')
+    identifiers = @manager.add_plugin_identifier_key('zoe', 'zoe_name', 'type', nil)
     identifiers.size.should == 3
-    identifiers['bar'].should == 'bar_name'
-    identifiers['foo'].should == 'foo_name'
-    identifiers['zoe'].should == 'zoe_name'
+    identifiers['bar']['plugin_name'].should == 'bar_name'
+    identifiers['foo']['plugin_name'].should == 'foo_name'
+    identifiers['zoe']['plugin_name'].should == 'zoe_name'
+  end
+
+  it 'creates plugin identifiers with duplicate entries' do
+    # Verifies file gets created if does not exist
+    identifiers = @manager.add_plugin_identifier_key('kewl', 'kewl_name', 'type', nil)
+    identifiers.size.should == 1
+    identifiers['kewl']['plugin_name'].should == 'kewl_name'
+
+    # Add with a different plugin_name
+    identifiers = @manager.add_plugin_identifier_key('kewl', 'kewl_name2', 'type', nil)
+    identifiers.size.should == 1
+    identifiers['kewl']['plugin_name'].should == 'kewl_name'
+  end
+
+
+  it 'creates plugin identifiers and remove entry' do
+    # Verifies file gets created if does not exist
+    identifiers = @manager.add_plugin_identifier_key('lol', 'lol_name', 'type', nil)
+    identifiers.size.should == 1
+    identifiers['lol']['plugin_name'].should == 'lol_name'
+
+    # Remove wrong entry, nothing happens
+    identifiers = @manager.remove_plugin_identifier_key('lol2')
+    identifiers.size.should == 1
+    identifiers['lol']['plugin_name'].should == 'lol_name'
+
+    # Remove correct entry
+    identifiers = @manager.remove_plugin_identifier_key('lol')
+    identifiers.size.should == 0
+
+    # Add same entry again
+    identifiers = @manager.add_plugin_identifier_key('lol', 'lol_name', 'type', nil)
+    identifiers.size.should == 1
+    identifiers['lol']['plugin_name'].should == 'lol_name'
+  end
+
+  it 'creates plugin identifiers and validate entry' do
+    # Verifies file gets created if does not exist
+    identifiers = @manager.add_plugin_identifier_key('yoyo', 'yoyo_name', 'type',  ['group', 'artifact', 'packaging', nil, 'version'])
+    identifiers.size.should == 1
+    identifiers['yoyo']['plugin_name'].should == 'yoyo_name'
+
+    @manager.validate_plugin_identifier_key('yoyo', ['group', 'artifact', 'packaging', nil, 'version']).should == true
+
+    # Negative validation
+    @manager.validate_plugin_identifier_key('yoyo', ['group1', 'artifact', 'packaging', nil, 'version']).should == false
   end
 
 
   it 'sets a path as active' do
     @manager.set_active(@plugin_dir.join('1.0.0'))
-    File.exists?(@plugin_dir.join('ACTIVE')).should be_true
-    File.readlink(@plugin_dir.join('ACTIVE')).should == @plugin_dir.join('1.0.0').to_s
+    File.exists?(@plugin_dir.join('SET_DEFAULT')).should be_true
+    File.readlink(@plugin_dir.join('SET_DEFAULT')).should == @plugin_dir.join('1.0.0').to_s
 
     @manager.set_active(@plugin_dir.join('2.0.0'))
-    File.exists?(@plugin_dir.join('ACTIVE')).should be_true
-    File.readlink(@plugin_dir.join('ACTIVE')).should == @plugin_dir.join('2.0.0').to_s
+    File.exists?(@plugin_dir.join('SET_DEFAULT')).should be_true
+    File.readlink(@plugin_dir.join('SET_DEFAULT')).should == @plugin_dir.join('2.0.0').to_s
   end
 
   it 'sets a plugin version as active' do
     @manager.set_active('killbill-stripe', '2.0.0')
-    File.exists?(@plugin_dir.join('ACTIVE')).should be_true
-    File.readlink(@plugin_dir.join('ACTIVE')).should == @plugin_dir.join('2.0.0').to_s
+    File.exists?(@plugin_dir.join('SET_DEFAULT')).should be_true
+    File.readlink(@plugin_dir.join('SET_DEFAULT')).should == @plugin_dir.join('2.0.0').to_s
 
     @manager.set_active('killbill-stripe', '1.0.0')
-    File.exists?(@plugin_dir.join('ACTIVE')).should be_true
-    File.readlink(@plugin_dir.join('ACTIVE')).should == @plugin_dir.join('1.0.0').to_s
+    File.exists?(@plugin_dir.join('SET_DEFAULT')).should be_true
+    File.readlink(@plugin_dir.join('SET_DEFAULT')).should == @plugin_dir.join('1.0.0').to_s
   end
 
   it 'uninstalls a plugin via a path' do
@@ -116,8 +181,8 @@ describe KPM::PluginsManager do
 
   private
 
-  def check_state(version, has_restart, has_stop)
+  def check_state(version, has_restart, has_disabled)
     File.exists?(@plugin_dir.join(version).join('tmp').join('restart.txt')).should == has_restart
-    File.exists?(@plugin_dir.join(version).join('tmp').join('stop.txt')).should == has_stop
+    File.exists?(@plugin_dir.join(version).join('tmp').join('disabled.txt')).should == has_disabled
   end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: kpm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kill Bill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.21
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nexus_cli
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
-  prerelease: false
-  type: :development
 description: A package manager for Kill Bill.
 email: killbilling-users@googlegroups.com
 executables:
@@ -87,8 +87,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemrelease
-- .gitignore
+- ".gemrelease"
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -127,26 +127,26 @@ homepage: http://kill-bill.org
 licenses:
 - Apache License (2.0)
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --exclude
-- .
+- "--exclude"
+- "."
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Kill Bill package manager.
 test_files: