digital_ocean_inventory 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 611b2b70cd34ba50a0ace0402f45605c766665c448d5be96384ea0561974d71f
-  data.tar.gz: e22b96a6616a01b1ab9938cebd2a046482629cf66e356bcfe00fdd5936e2ba38
+  metadata.gz: 49db0ef1f05794822bf84ae4c53c758f0850893b75d2532d89a4b8ded7473989
+  data.tar.gz: 9e1437fd9c2e26f89cd63d111b497445012bfaa7a55d3055f3132804400ee66c
 SHA512:
-  metadata.gz: a256abc0d6eab4cefea9af3281a17591004f8ba5f7cc9340d314e99a6503bbc0305273052b2ace8740004f42820283d0a1daf7ab2b9bf804142a17ff2da7a0f8
-  data.tar.gz: f3988e39f4f240dfbf42e65172a6fc16e608294a0a8bcfec00c29fef1f7a47559e62d1f60674e01a0956ae711662fcefb0c0db32b9d8e31424ce501f0c800556
+  metadata.gz: 1fe746fd14107495635530b15d74995dcf8454e4adebade5d792bea4666983adbd9853ab73cdc8e71ba6a0c7943ac4f7da5437ad4c802acd2b6fde3a136594f5
+  data.tar.gz: 6a113ae4b7f19e8994619563077dc7b3b687d8007c05e3e55275aad672420c31e2f0a1bba0558469b64526ce120a28751fab96a6b372fc94c3b99e2bca9814eb

data/lib/digital_ocean_inventory/collector.rb

@@ -50,10 +50,8 @@ module DigitalOceanInventory
       end
 
       def select_droplet?(droplet)
-        return true if config.select_tags.empty?
-
         tags = droplet.tags || []
-        config.select_tags.any? { |t| tags&.include? t }
+        tags.any? { _1 == "ansible:enable" }
       end
 
       def ignore_droplet?(droplet)
@@ -71,10 +69,16 @@ module DigitalOceanInventory
       end
 
       def droplet_groups(droplet)
-        groups = []
+        groups = %w[digitalocean]
         groups << droplet.region.slug if config.group_by_region
         groups << droplet_vpc(droplet)
-        droplet.tags&.each { |t| groups << t } if config.group_by_tag
+
+        droplet.tags
+               &.uniq
+               &.select { |t| t.match? /^ansible:g:/ }
+               &.map { |t| t.gsub "ansible:g:", "" }
+               &.each { |t| groups << t }
+
         groups.uniq.map { |g| g.gsub('-', '_') }
       end
 
@@ -83,39 +87,5 @@ module DigitalOceanInventory
         vpc = config.client.vpcs.find id: id
         vpc.name
       end
-      # def add_droplets
-      #   project_droplets.each do |droplet|
-      #     name = droplet.name
-      #     groups = ["digitalocean"]
-
-      #     if droplet.region.name.include? "nyc"
-      #       groups << "usa"
-      #       groups << "nyc"
-      #     elsif droplet.region.name.include? "sfo"
-      #       groups << "usa"
-      #       groups << "sfo"
-      #     end
-
-      #     tags = droplet.tags || []
-      #     groups = groups.concat tags
-
-      #     groups << droplet.image.distribution.downcase
-      #     # groups << droplet.image.name
-
-      #     public_net = droplet.networks.v4.find { |n| n.type == "public" }
-      #     private_net = droplet.networks.v4.find { |n| n.type == "private" }
-
-      #     inventory.host name, groups: groups, vars: dns_results[:vars].merge({
-      #       public_ip: public_net.ip_address,
-      #       private_ip: private_net.ip_address,
-      #       droplet_id: droplet.id,
-      #       vpc_uuid: droplet.vpc_uuid,
-      #       digitalocean_tags: tags,
-      #       internal_dns_records: dns_results[:dns]
-      #     })
-      #   end
-      # end
-
-
   end
 end

data/lib/digital_ocean_inventory/version.rb

@@ -1,3 +1,3 @@
 module DigitalOceanInventory
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digital_ocean_inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Hurst
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: droplet_kit