ocean_kit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d343d2e641d29b1d725b8fa28cc31ae1f315c6066301d259690044e5bdec0c
-  data.tar.gz: fe8ea0a906be855815be19084fdba93c37cdb39ddafc70fb3d963e56b1294541
+  metadata.gz: 2b7e53bd320bed32a746bf8c938e41916adc797399bc99f31588b1a046e0251f
+  data.tar.gz: bbc4ccb88be8a07bf60856eff18070c0506dd0b65493b2f2e8fefdae0a5593f3
 SHA512:
-  metadata.gz: 18da4133b0419fec8d780d1eeaa5fa7a97e271cc4a99daeb8329d2ca0045757bfd34b9fea68cf346fcac4feca10ab66edbcd264404245bbfa7aa9809d9f73197
-  data.tar.gz: 71c1d8033773066e2ae9d6418bcfb2e4ceb274483131cddbe6677b3c9093250276dacba52a12bfb0fdb94e8d65f74d0bac6942938cfa7bed8eb7cbacc72d686a
+  metadata.gz: 91c945c7f2b00964879a4c90db6b5d1190c5de0acc90dda89abeb64f682628ec2f5616d8276e315f3fedaa80bd4f30b89a27fa683488ba75b45059453bb54f2c
+  data.tar.gz: 2054bd0e4293709c4616a9f40538d0f6b733a8e40537eb727802c943148fb42e8537534b1ebe428bc9a6b205fd32e624e989fd63d13d98d5cc097b29dbf5fbb1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ocean_kit (0.1.1)
+    ocean_kit (0.1.2)
       droplet_kit (~> 3.16, >= 3.16.1)
       pastel
       thor (~> 1.2)

data/exe/ocean_kit

@@ -2,6 +2,4 @@
 
 require "ocean_kit"
 
-require_relative "../lib/helpers"
-
 OceanKit::Client.start(ARGV)

data/lib/ocean_kit/helpers/base.rb

@@ -0,0 +1,3 @@
+require_relative "./client"
+require_relative "./console"
+require_relative "./firewalls"

data/lib/ocean_kit/helpers/client.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+def do_client
+  DropletKit::Client.new(access_token: access_token)
+end
+
+def access_token
+  credentials_file = YAML.load(File.read(File.expand_path("~/.ocean_kit/credentials.yml")))
+  credentials_file["digital_ocean_token"]
+rescue => e
+  puts pastel.red.bold("Error: #{e.message}")
+end

data/lib/ocean_kit/helpers/console.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+def pastel
+  Pastel.new
+end

data/lib/ocean_kit/helpers/firewalls.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+def fetch_firewall(number)
+  do_client.firewalls.all.each_with_index.filter { |firewall, index| index == number.to_i }.flatten.first
+end
+
+def update_firewall(firewall)
+  new_firewall = DropletKit::Firewall.new(
+    name: firewall.name,
+    inbound_rules: firewall.inbound_rules.map { |rule| new_inbound_rule(rule) },
+    outbound_rules: firewall.outbound_rules,
+    droplet_ids: firewall.droplet_ids,
+    tags: firewall.tags
+  )
+  do_client.firewalls.update(new_firewall, id: firewall.id)
+end
+
+def firewall_inbound_rules(firewall)
+  firewall.inbound_rules.map(&:to_h)
+end
+
+def new_inbound_rule(rule)
+  DropletKit::FirewallInboundRule.new(
+    protocol: rule[:protocol],
+    ports: rule[:ports],
+    sources: rule[:sources]
+  )
+end
+
+def remove_ssh_rule(rules_array)
+  rules_array.delete_if { |r| r[:ports] == "22" }
+end
+
+def add_ssh_rule(rules_array)
+  rules_array << {protocol: "tcp", ports: "22", sources: {addresses: ["0.0.0.0/0", "::/0"]}}
+end

data/lib/ocean_kit/resources/base.rb

@@ -0,0 +1 @@
+require_relative "./firewalls"

data/lib/ocean_kit/{firewalls.rb → resources/firewalls.rb}

@@ -68,50 +68,5 @@ module OceanKit
         puts pastel.red.bold("Error: #{e.message}")
       end
     end
-
-    private
-
-    def fetch_firewall(number)
-      do_client.firewalls.all.each_with_index.filter { |firewall, index| index == number.to_i }.flatten.first
-    end
-
-    def update_firewall(firewall)
-      new_firewall = DropletKit::Firewall.new(
-        name: firewall.name,
-        inbound_rules: firewall.inbound_rules.map { |rule| new_inbound_rule(rule) },
-        outbound_rules: firewall.outbound_rules,
-        droplet_ids: firewall.droplet_ids,
-        tags: firewall.tags
-      )
-      do_client.firewalls.update(new_firewall, id: firewall.id)
-    end
-
-    def firewall_inbound_rules(firewall)
-      firewall.inbound_rules.map(&:to_h)
-    end
-
-    def new_inbound_rule(rule)
-      DropletKit::FirewallInboundRule.new(
-        protocol: rule[:protocol],
-        ports: rule[:ports],
-        sources: rule[:sources]
-      )
-    end
-
-    def remove_ssh_rule(rules_array)
-      rules_array.delete_if { |r| r[:ports] == "22" }
-    end
-
-    def add_ssh_rule(rules_array)
-      rules_array << {protocol: "tcp", ports: "22", sources: {addresses: ["0.0.0.0/0", "::/0"]}}
-    end
-
-    def pastel
-      Pastel.new
-    end
-
-    def find_firewall_by_id(id)
-      do_client.firewalls.find(id:)
-    end
   end
 end

data/lib/ocean_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OceanKit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/ocean_kit.rb

@@ -6,23 +6,13 @@ require "thor"
 require "yaml"
 
 require_relative "ocean_kit/version"
-require_relative "./ocean_kit/firewalls"
+require_relative "./ocean_kit/resources/base"
+require_relative "./ocean_kit/helpers/base"
 
 module OceanKit
   class Client < Thor
     desc "firewalls SUBCOMMAND ...ARGS", "manage your DO firewall"
     subcommand "firewalls", Firewalls
-
-    no_commands {
-      def client
-        DropletKit::Client.new(access_token: access_token)
-      end
-
-      def access_token
-        credentials_file = YAML.load(File.read(File.expand_path("~/.ocean_kit/credentials.yml")))
-        credentials_file["digital_ocean_token"]
-      end
-    }
   end
 
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Leo Policastro
@@ -77,9 +77,13 @@ files:
 - README.md
 - Rakefile
 - exe/ocean_kit
-- lib/helpers.rb
 - lib/ocean_kit.rb
-- lib/ocean_kit/firewalls.rb
+- lib/ocean_kit/helpers/base.rb
+- lib/ocean_kit/helpers/client.rb
+- lib/ocean_kit/helpers/console.rb
+- lib/ocean_kit/helpers/firewalls.rb
+- lib/ocean_kit/resources/base.rb
+- lib/ocean_kit/resources/firewalls.rb
 - lib/ocean_kit/version.rb
 - ocean_kit.gemspec
 - sig/ocean_kit.rbs

data/lib/helpers.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-def do_client
-  ocean = OceanKit::Client.new
-  ocean.client
-end