kube-dsl 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 739db8c0f3054804ce25cb35ea42611f2f43eea31f8dea92997d1351311696fe
-  data.tar.gz: 361429db242279d9916f4f1759fa946f2be35c2d3d4a783e82f6640d098d7b7e
+  metadata.gz: 03cadaa643bb90a6baa5338e3de7905f8243c0032fde7991db072ad7b964691c
+  data.tar.gz: 40feae243bcc6e2a953b1b97ae0bbd865b6239354e7abe47b471227b2dff582a
 SHA512:
-  metadata.gz: d12777c4d88d675c3f152d8ecb3cfa62fd61e4161d14752b3784f1c543e1e985bf143934b0d778de070d246bb918d8439f8f40f74d0ccf2eeb309c0e476b4892
-  data.tar.gz: '096d6b76c15e982072f50f3207b990b60e61ecac9add7e55387974c9885afdca9f34b5369b1cb9081b364304e90bc29a876e5d2a543a1f4f8b21b405262841a5'
+  metadata.gz: f4c771dd4d07ee252b160c1ca4d0de23b913298974bf12f9374ac58ff05aa368a0962a458a9543cb959fea1e4a1596257b22a0b4571d88a0a6bf634f920d1210
+  data.tar.gz: 17ac1ab5ebea2c780623bc8d5bf7600b660b09d709c2a132bedb130477b9c61f8377ecf6f22cb9be8335778eb902f1736e5d0adf1d45fa4ad65a230c81be1bc9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.0
+* Improve path and namespace handling in generator.
+
 ## 0.5.1
 * Support Ruby 2.7
   - Stop using the `RubyToken` class from irb, which doesn't exist anymore.

data/Rakefile

@@ -16,6 +16,7 @@ end
 
 task :generate do
   require 'dry/inflector'
+  require 'fileutils'
 
   FileUtils.rm_rf('./lib/kube-dsl/entrypoint.rb')
   FileUtils.rm_rf('./lib/kube-dsl/dsl.rb')
@@ -24,33 +25,36 @@ task :generate do
   FileUtils.mkdir_p('./vendor')
 
   export_url = "https://github.com/instrumenta/kubernetes-json-schema/trunk/v#{KubeDSL::KUBERNETES_VERSION}-local"
-  local_path = "vendor/kubernetes-json-schema/v#{KubeDSL::KUBERNETES_VERSION}-local"
+  local_schema_path = "vendor/kubernetes-json-schema/v#{KubeDSL::KUBERNETES_VERSION}-local"
 
-  unless File.exist?(local_path)
-    system("svn export #{export_url} #{local_path}")
+  unless File.exist?(local_schema_path)
+    system("svn export #{export_url} #{local_schema_path}")
   end
 
-  Dir.chdir('lib') do
-    generator = KubeDSL::Generator.new(
-      schema_dir: File.join('..', local_path),
-      output_dir: File.join('kube-dsl', 'dsl'),
-      inflector: Dry::Inflector.new do |inflections|
-        inflections.acronym('DSL')
-
-        inflections.plural('tls', 'tlses')
-        inflections.singular('tls', 'tls')
-        inflections.plural('enum', 'enums')
-        inflections.plural('one_of', 'one_ofs')
-        inflections.plural('any_of', 'any_ofs')
-        inflections.plural('all_of', 'all_ofs')
-      end
-    )
-
-    generator.generate_resource_files
-    generator.generate_autoload_files
-    generator.generate_entrypoint_file do |resource, ns|
-      version = resource.ref.version || ''
-      !version.include?('beta') && !version.include?('alpha')
+  generator = KubeDSL::Generator.new(
+    schema_dir: local_schema_path,
+    output_dir: File.join('lib'),
+    autoload_prefix: File.join('kube-dsl', 'dsl'),
+    dsl_namespace: ['KubeDSL', 'DSL'],
+    entrypoint_namespace: ['KubeDSL'],
+    inflector: Dry::Inflector.new do |inflections|
+      inflections.acronym('DSL')
+
+      inflections.singular('tls', 'tls')
+      inflections.singular('causes', 'cause')
+
+      inflections.plural('tls', 'tlses')
+      inflections.plural('enum', 'enums')
+      inflections.plural('one_of', 'one_ofs')
+      inflections.plural('any_of', 'any_ofs')
+      inflections.plural('all_of', 'all_ofs')
     end
+  )
+
+  generator.generate_resource_files
+  generator.generate_autoload_files
+  generator.generate_entrypoint_file do |resource, ns|
+    version = resource.ref.version || ''
+    !version.include?('beta') && !version.include?('alpha')
   end
 end

data/lib/kube-dsl/builder.rb

@@ -4,12 +4,17 @@ module KubeDSL
   class Builder
     include StringHelpers
 
-    attr_reader :schema_dir, :output_dir, :namespace, :inflector, :resolvers
+    attr_reader :schema_dir, :output_dir, :autoload_prefix
+    attr_reader :dsl_namespace, :entrypoint_namespace
+    attr_reader :inflector, :resolvers
 
-    def initialize(schema_dir:, output_dir:, inflector:)
+    def initialize(schema_dir:, output_dir:, autoload_prefix:, inflector:, dsl_namespace:, entrypoint_namespace:)
       @schema_dir = schema_dir
       @output_dir = output_dir
+      @autoload_prefix = autoload_prefix
       @inflector = inflector
+      @dsl_namespace = dsl_namespace
+      @entrypoint_namespace = entrypoint_namespace
       @resolvers ||= {}
     end
 
@@ -19,25 +24,17 @@ module KubeDSL
       end
     end
 
-    def each_resource
+    def each_resource_file
       return to_enum(__method__) unless block_given?
 
-      resources.each do |res|
-        # "External" resources are ones that live outside the current
-        # schema, i.e. k8s resources like ObjectMeta that other
-        # k8s-compatible schemas depend on.
-        #
-        # Resources can be "empty" if they contain no properties. This
-        # usually happens for resources that are really just aliases
-        # for basic types like integer and string. The k8s' Duration
-        # object is a good example. It's just an alias for string.
-        yield res if !res.external? && !res.empty?
+      each_resource do |res|
+        yield File.join(output_dir, res.ref.ruby_autoload_path), res
       end
     end
 
     def entrypoint(&block)
       ''.tap do |ruby_code|
-        ruby_code << "module #{namespace[0..-2].join('::')}::Entrypoint\n"
+        ruby_code << "module #{entrypoint_namespace.join('::')}::Entrypoint\n"
 
         each_resource do |resource|
           ns = resource.ref.ruby_namespace.join('::')
@@ -53,26 +50,15 @@ module KubeDSL
       end
     end
 
-    def namespace
-      @namespace ||= inflector.classify(
-        File
-          .split(output_dir)
-          .map { |seg| inflector.camelize(underscore(seg)) }
-          .join('/')
-      ).split('::')
-    end
-
     def entrypoint_path
-      File.join(File.dirname(output_dir), 'entrypoint.rb')
+      File.join(output_dir, File.dirname(autoload_prefix), 'entrypoint.rb')
     end
 
     def each_autoload_file(&block)
       return to_enum(__method__) unless block
 
-      start = output_dir.split(File::SEPARATOR).first
-
       each_autoload_file_helper(
-        autoload_map[start], [start], &block
+        autoload_map[:root], [], &block
       )
     end
 
@@ -88,11 +74,27 @@ module KubeDSL
     end
 
     def parse_ref(ref_str)
-      Ref.new(ref_str, namespace, output_dir, inflector, schema_dir)
+      Ref.new(ref_str, dsl_namespace, inflector, schema_dir, autoload_prefix)
     end
 
     private
 
+    def each_resource
+      return to_enum(__method__) unless block_given?
+
+      resources.each do |res|
+        # "External" resources are ones that live outside the current
+        # schema, i.e. k8s resources like ObjectMeta that other
+        # k8s-compatible schemas depend on.
+        #
+        # Resources can be "empty" if they contain no properties. This
+        # usually happens for resources that are really just aliases
+        # for basic types like integer and string. The k8s' Duration
+        # object is a good example. It's just an alias for string.
+        yield res if !res.external? && !res.empty?
+      end
+    end
+
     def resources
       JSON.parse(File.read(start_path))['oneOf'].map do |entry|
         resource_from_ref(resolve_ref(entry['$ref']))
@@ -105,7 +107,7 @@ module KubeDSL
           parts = res.ref.ruby_autoload_path.split(File::SEPARATOR)
           parts.reject!(&:empty?)
 
-          parts.inject(amap) do |ret, seg|
+          [:root, *parts].inject(amap) do |ret, seg|
             if seg.end_with?('.rb')
               ret[seg] = res
             else
@@ -137,7 +139,7 @@ module KubeDSL
         end
 
         ruby_code << "end\n"
-        yield File.join(*path, "#{ns}.rb"), ruby_code
+        yield File.join(output_dir, *path, "#{ns}.rb"), ruby_code
         each_autoload_file_helper(children, path + [ns], &block)
       end
     end
@@ -216,7 +218,7 @@ module KubeDSL
     end
 
     def start_path
-      @entrypoint_path ||= File.join(schema_dir, 'all.json')
+      @start_path ||= File.join(schema_dir, 'all.json')
     end
 
     def resource_cache

data/lib/kube-dsl/dsl/pkg/version/info.rb

@@ -1,6 +1,24 @@
 module KubeDSL::DSL::Pkg::Version
   class Info < ::KubeDSL::DSLObject
-    value_fields :build_date, :compiler, :git_commit, :git_tree_state, :git_version, :go_version, :major, :minor, :platform
+    value_field :build_date
+    value_field :compiler
+    value_field :git_commit
+    value_field :git_tree_state
+    value_field :git_version
+    value_field :go_version
+    value_field :major
+    value_field :minor
+    value_field :platform
+
+    validates :build_date, field: { format: :string }, presence: false
+    validates :compiler, field: { format: :string }, presence: false
+    validates :git_commit, field: { format: :string }, presence: false
+    validates :git_tree_state, field: { format: :string }, presence: false
+    validates :git_version, field: { format: :string }, presence: false
+    validates :go_version, field: { format: :string }, presence: false
+    validates :major, field: { format: :string }, presence: false
+    validates :minor, field: { format: :string }, presence: false
+    validates :platform, field: { format: :string }, presence: false
 
     def serialize
       {}.tap do |result|

data/lib/kube-dsl/generator.rb

@@ -13,14 +13,14 @@ module KubeDSL
     end
 
     def generate_resource_files
-      builder.each_resource do |res|
-        FileUtils.mkdir_p(File.dirname(res.ref.ruby_autoload_path))
+      builder.each_resource_file do |path, res|
+        FileUtils.mkdir_p(File.dirname(path))
 
-        if File.exist?(res.ref.ruby_autoload_path)
-          puts "Skipping #{res.ref.ruby_autoload_path} because it already exists"
+        if File.exist?(path)
+          puts "Skipping #{path} because it already exists"
         else
-          puts "Writing #{res.ref.ruby_autoload_path}"
-          File.write(res.ref.ruby_autoload_path, res.to_ruby)
+          puts "Writing #{path}"
+          File.write(path, res.to_ruby)
         end
       end
     end

data/lib/kube-dsl/ref.rb

@@ -5,12 +5,12 @@ module KubeDSL
     attr_reader :str, :kind, :namespace, :version, :inflector, :schema_dir
     attr_reader :ruby_namespace_prefix, :autoload_prefix
 
-    def initialize(str, ruby_namespace_prefix, autoload_prefix, inflector, schema_dir)
+    def initialize(str, ruby_namespace_prefix, inflector, schema_dir, autoload_prefix)
       @str = str
       @ruby_namespace_prefix = ruby_namespace_prefix
-      @autoload_prefix = autoload_prefix
       @inflector = inflector
       @schema_dir = schema_dir
+      @autoload_prefix = autoload_prefix
 
       ns, v, k = str.split('.').last(3)
 
@@ -41,15 +41,18 @@ module KubeDSL
     def ruby_namespace
       @ruby_namespace ||= begin
         [*ruby_namespace_prefix].tap do |mods|
-          mods << capitalize(namespace) if namespace
-          mods << capitalize(version) if version
+          mods << namespace if namespace
+          mods << version if version
+          mods.map! do |m|
+            inflector.camelize(underscore(m))
+          end
         end
       end
     end
 
     def ruby_autoload_path
       @ruby_autoload_path ||= File.join(
-        [*autoload_prefix.split(File::SEPARATOR)].tap do |path|
+        [autoload_prefix].tap do |path|
           path << underscore(namespace) if namespace
           path << underscore(version) if version
           path << "#{underscore(kind)}.rb"

data/lib/kube-dsl/version.rb

@@ -1,3 +1,3 @@
 module KubeDSL
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kube-dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -803,7 +803,7 @@ files:
 homepage: http://github.com/getkuby/kube-dsl
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -818,8 +818,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A Ruby DSL for defining Kubernetes resources.
 test_files: []