k_director 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0208f9ecd1fa6a0a1a649266a9a6a823e7db688c632e9f79681c9386d6a4a3fb'
-  data.tar.gz: '08140ee775462704f34ade6c236000ed615e877007b9fc1d48dc748de222c72b'
+  metadata.gz: 0672ad44c4bedc02e26c444b2d2dd018d12e6d979a8d87fe751c30544e77b878
+  data.tar.gz: a58c986bc9d6b969368e423b124710726b59f9f3a7157f1c61ae9119bef6433b
 SHA512:
-  metadata.gz: 49321aaf3a58a70ea34e0668cfe89e91ff069bffa2301cd90b51ab64a446b41d69dc2501f2d3cea469d47f8af31f57965840b664f55bad79e14321bbcefd436e
-  data.tar.gz: 04d83e5f3b8d1f8d89ea07eba68b393836a13d8e0876069d38017d1001fe5bd02f1e68803e208f3e020d783eabd5a3280fa673e5784f5ca7f5816f4eb795369e
+  metadata.gz: 98a1a2ffa7ebfb543395ec9362d2c05721d98fb2158b51daf8af4040297abbd0a2209ce31b59ac637fb598caaaa6af17c7c246e2ae0c5be90023f93666e305d8
+  data.tar.gz: 187c6b3e7b2be6f0f51994741771cae2399f87db17fba890afb042035235698627110a9aa43696591de970c2b9d32c21fce68d82dd2a3cc23054cd6be17d4100

data/.builders/generators/01-bootstrap.rb

@@ -35,6 +35,7 @@ KManager.action :bootstrap do
         # list_repositories
         # open_repository # (:k_director)
         # run_command('git init')
+        # k_director git:(main) gh repo edit -d "KDirector provides domain specific language (DSL) implementations for code generation"
       end
       .blueprint(
         name: :bin_hook,

data/.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
     name: Ruby ${{ matrix.ruby }}
     strategy:
@@ -22,32 +22,70 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
 
-    - name: Run tests
-      run: bundle exec rspec
+    - id: lint
+      name: Run rubocop
+      run: bundle exec rubocop
 
-    - name: Slack notify on rspec error
-      if: failure()
+    - name: Slack notification on rubocop error
+      if: steps.lint.conclusion == 'failure'
       uses: rtCamp/action-slack-notify@v2
       env:
         SLACK_CHANNEL: klueless-repos
         SLACK_COLOR: '#ff0000'
         SLACK_ICON: https://avatars.githubusercontent.com/u/2956762?s=64&v=4
-        SLACK_TITLE: 'RSpec failure on ${{github.repository}} - try:'
-        SLACK_MESSAGE: 'rspec'
+        SLACK_TITLE: 'Rubocop failure on $ - try:'
+        SLACK_MESSAGE: 'cop -a'
         SLACK_USERNAME: klueless-io
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}        
+        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
-    - name: Run rubocop
-      run: bundle exec rubocop
+    - id: rspec
+      name: Run tests
+      run: bundle exec rspec
 
-    - name: Slack notification on rubocop error
-      if: failure()
+    - name: Slack notify on rspec error
+      if: steps.rspec.conclusion == 'failure'
       uses: rtCamp/action-slack-notify@v2
       env:
         SLACK_CHANNEL: klueless-repos
         SLACK_COLOR: '#ff0000'
         SLACK_ICON: https://avatars.githubusercontent.com/u/2956762?s=64&v=4
-        SLACK_TITLE: 'Rubocop failure on $ - try:'
-        SLACK_MESSAGE: 'cop -a'
+        SLACK_TITLE: 'RSpec failure on ${{github.repository}} - try:'
+        SLACK_MESSAGE: 'rspec'
         SLACK_USERNAME: klueless-io
         SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}        
+
+  release:
+    needs: build
+    name: Update version and publish to RubyGems
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      # - uses: hmarr/debug-action@v2 # TURN on ENV DEBUG
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        id: cache-node-modules
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Install semantic-release dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: npm ci
+
+        # SEE MORE: https://github.com/semantic-release/semantic-release/issues/753
+      - name: Run SemVer
+        run: npm run release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}

data/docs/CHANGELOG.md

@@ -1,3 +1,51 @@
+## [0.6.2](https://github.com/klueless-io/k_director/compare/v0.6.1...v0.6.2) (2022-02-01)
+
+
+### Bug Fixes
+
+* merge main and semver gha workflows ([5c3a9e4](https://github.com/klueless-io/k_director/commit/5c3a9e4a6f01129cc513760b86453a4201835765))
+* merge main and semver gha workflows - final ([0c5eb76](https://github.com/klueless-io/k_director/commit/0c5eb76d8008d5ec869fdb9c9adcc306e6a51604))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([f20f719](https://github.com/klueless-io/k_director/commit/f20f719f5f82d5761b9886b1d294750a761a7376))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([2102bca](https://github.com/klueless-io/k_director/commit/2102bca3ebe67d75e4d8d6c12cf962420371264c))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([9f384fd](https://github.com/klueless-io/k_director/commit/9f384fd88ab7ec39fd15b256b61c146e113f4a8d))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([bd4dbcd](https://github.com/klueless-io/k_director/commit/bd4dbcd842f5dee4dabc7eb9495a6f143a02d3ef))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([79c793d](https://github.com/klueless-io/k_director/commit/79c793d46accb10dc81a0bc0b9f8bbc451f03df7))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([353bc81](https://github.com/klueless-io/k_director/commit/353bc81eab7759fba7be3d12ca73293699c70146))
+* merge main and semver gha workflows [#2](https://github.com/klueless-io/k_director/issues/2) ([61f4772](https://github.com/klueless-io/k_director/commit/61f4772cac5400b0085f9081a46f8fbc68471534))
+* merge main and semver gha workflows [#3](https://github.com/klueless-io/k_director/issues/3) ([ee13161](https://github.com/klueless-io/k_director/commit/ee131618a66dea1a0996f4be897bcfe6b902482f))
+* merge main and semver gha workflows [#3](https://github.com/klueless-io/k_director/issues/3) ([074b65c](https://github.com/klueless-io/k_director/commit/074b65cfd95d1e6fc355f8ec0d47f03ec6c9b867))
+* merge main and semver gha workflows [#4](https://github.com/klueless-io/k_director/issues/4) ([8001aa5](https://github.com/klueless-io/k_director/commit/8001aa5be830197baaa5e956c6b5bd010479fd60))
+* merge main and semver gha workflows [#5](https://github.com/klueless-io/k_director/issues/5) ([6ba2432](https://github.com/klueless-io/k_director/commit/6ba2432126c8c1fe5e157d470e6c8609cea174d6))
+* merge main and semver gha workflows [#6](https://github.com/klueless-io/k_director/issues/6) ([62eb60e](https://github.com/klueless-io/k_director/commit/62eb60e55dbfed3aa16faf17e137b39505e2e8a8))
+* merge main and semver gha workflows [#7](https://github.com/klueless-io/k_director/issues/7) ([30fba4b](https://github.com/klueless-io/k_director/commit/30fba4b7da6aced100dfd68a750e051f6ddc0da8))
+* merge main and semver gha workflows [#8](https://github.com/klueless-io/k_director/issues/8) ([e6a55f7](https://github.com/klueless-io/k_director/commit/e6a55f73235a556861140358592f6b5d031dec24))
+
+## [0.6.1](https://github.com/klueless-io/k_director/compare/v0.6.0...v0.6.1) (2022-01-31)
+
+
+### Bug Fixes
+
+* add data to base (plus settings) to director ([bee18a1](https://github.com/klueless-io/k_director/commit/bee18a1eda36d802611c5cf354031963daa82c69))
+
+# [0.6.0](https://github.com/klueless-io/k_director/compare/v0.5.0...v0.6.0) (2022-01-31)
+
+
+### Bug Fixes
+
+* add improve group_set on action_builder ([b11ff25](https://github.com/klueless-io/k_director/commit/b11ff25475d48c07af67f3e82bff58ab903ae4a5))
+
+
+### Features
+
+* add data director class ([510d970](https://github.com/klueless-io/k_director/commit/510d9701480a57580b0cc4f4a58398ce7752a431))
+
+# [0.5.0](https://github.com/klueless-io/k_director/compare/v0.4.1...v0.5.0) (2022-01-31)
+
+
+### Features
+
+* add group_set to action_builder ([62d87ed](https://github.com/klueless-io/k_director/commit/62d87ed27cb1479cf5ba3a2fa8cac70fa71f63fd))
+
 ## [0.4.1](https://github.com/klueless-io/k_director/compare/v0.4.0...v0.4.1) (2022-01-30)
 
 

data/k_director.gemspec

@@ -44,5 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'k_log', '~> 0.0.0'
   # spec.add_dependency 'k_type', '~> 0.0.0'
   spec.add_dependency 'k_builder', '~> 0.0.0'
+  spec.add_dependency 'k_ext-github', '~> 0.0.0'
   spec.add_dependency 'k_util', '~> 0.0.0'
 end

data/lib/k_director/builders/actions_builder.rb

@@ -26,10 +26,19 @@ module KDirector
       # Set many key/value pairs gainst a group
       #
       # example:
-      #   set_many(:github, { repo_name: 'repo-name', organization: 'org-name' })
-      def group_set(group, **opts)
-        opts.each do |key, value|
-          set(group, key, value)
+      #   set_many(:github, repo_name: 'repo-name', organization: 'org-name')
+      def group_set(group = nil, **opts)
+        return if group.nil? && opts.empty?
+
+        if group.nil?
+          opts.each do |key, value|
+            set(key, value)
+          end
+        else
+          dom[group] = {} if opts.empty? # initialize the group name if no options are provided
+          opts.each do |key, value|
+            set(group, key, value)
+          end
         end
       end
 

data/lib/k_director/directors/base_director.rb

@@ -34,6 +34,18 @@ module KDirector
         @options.on_action            ||= :queue      # %i[queue execute]
       end
 
+      def data(name = nil, **opts)
+        KDirector::Directors::Data.new(self, name, **opts)
+
+        self
+      end
+
+      def settings(**opts)
+        KDirector::Directors::Data.new(self, :settings, **opts)
+
+        self
+      end
+
       def dom
         builder.dom
       end

data/lib/k_director/directors/data.rb

@@ -1,57 +1,17 @@
 # frozen_string_literal: true
 
 module KDirector
-  module Dsls
-    module Children
-      # Blueprint DSL is used to add files to the target folder.
-      #
-      # A blueprint is a recipe that you can follow to build out assets on the target application
-      class Blueprint < KDirector::Directors::ChildDirector
-        # Add a single file into the code base
-        #
-        # @param [String] output_filename The output file name, this can be a relative path
-        # @param [Hash] **opts The options
-        # @option opts [String] :template_filename Template filename can be set or it will default to the same value as the output file name
-        # @option opts [String] :template_subfolder Template subfolder
-        def add(output_file, **opts)
-          template_file = opts[:template_file] || output_file
-          template_parts = [template_base_folder, opts[:template_subfolder], template_file].reject(&:blank?)
-          template_path = File.join(*template_parts)
+  module Directors
+    # Data can update the underlying ActionBuilder DOM.
+    class Data
+      attr_reader :parent
+      attr_reader :name
 
-          # maybe template_file should be renamed to template_path in k_builder
-          opts[:template_file] = template_path
+      def initialize(parent, name, **opts)
+        @parent = parent
+        @name   = name
 
-          add_file(output_file, **opts)
-        end
-
-        def oadd(name, **opts)
-          add(name, **{ open: true          }.merge(opts))
-        end
-
-        def tadd(name, **opts)
-          add(name, **{ open_template: true }.merge(opts))
-        end
-
-        def fadd(name, **opts)
-          add(name, **{ on_exist: :write    }.merge(opts))
-        end
-
-        # def template_content(template_file, **opts)
-        #   template_parts = [template_base_folder, opts[:template_subfolder], template_file].reject(&:blank?)
-        #   template_file = File.join(*template_parts)
-
-        #   file = k_builder.find_template_file(template_file)
-        #   File.read(file)
-        # end
-
-        def run_template_script(template_file, **opts)
-          template_parts = [template_base_folder, opts[:template_subfolder], template_file].reject(&:blank?)
-          template_path = File.join(*template_parts)
-
-          script = k_builder.process_any_content(template_file: template_path, **opts)
-
-          run_script(script)
-        end
+        parent.builder.group_set(name, **opts)
       end
     end
   end

data/lib/k_director/dsls/children/github.rb

@@ -12,22 +12,146 @@ module KDirector
         def initialize(parent, **opts)
           super(parent, **opts)
 
-          @options.repo_name          ||= parent.options.repo_name
-          @options.repo_organization  ||= parent.options.repo_organization
-        end
+          defaults = {
+            repo_name: opts[:repo_name], # || parent.builder.dom&[:github]&[:repo_name]
+            user: opts[:user] || default_github_user, # || parent.builder.dom&[:github]&[:user]
+            organization: opts[:organization] # || parent.builder.dom&[:github]&[:organization]
+          }
 
-        def repo
-          return parent.options.repo if defined? parent.options.repo
+          parent.builder.group_set(:github, **defaults)
+        end
 
-          parent.options.repo = OpenStruct.new(name: nil, organization: nil)
+        def repo_name
+          parent.builder.dom[:github][:repo_name]
         end
 
-        def name
-          repo.repo_name
+        def user
+          parent.builder.dom[:github][:user]
         end
 
         def organization
-          repo.repo_organization
+          parent.builder.dom[:github][:organization]
+        end
+
+        def list_repositories
+          repos = create_api.all_repositories
+
+          KExt::Github::Printer.repositories_as_table repos
+
+          log.kv 'Repository count', repos.length
+        rescue StandardError => e
+          log.exception(e)
+        end
+
+        def open_repository(**opts)
+          info = repo_info(**opts)
+
+          system("open -a 'Google Chrome' #{info.link}")
+        end
+
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def create_repository(**opts)
+          info = repo_info(**opts)
+
+          if info.repo_name.blank?
+            log.error 'Repository name is required'
+            return
+          end
+
+          repo = create_api.all_repositories.find { |r| r.full_name == info.full_name }
+
+          if repo.nil?
+            log.heading 'Repository create'
+            log.kv 'Repository Name', info.repo_name
+            log.kv 'Repository Full Name', info.full_name
+            log.kv 'Organization Name', info.organization if info.organization
+            success = create_api.create_repository(info.repo_name, organization: info.organization)
+            log.info "Repository: #{info.full_name} created" if success
+            log.error "Repository: #{info.full_name} was not created" unless success
+
+            system("open -a 'Google Chrome' #{info.link}") if opts[:open]
+          else
+            log.warn 'Repository already exists, nothing to create'
+          end
+
+          log_repo_info(info)
+        rescue StandardError => e
+          log.exception(e)
+        end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def delete_repository(**opts)
+          info = repo_info(**opts)
+
+          if info.repo_name.blank?
+            log.error 'Repository name is required'
+            return
+          end
+
+          repo = create_api.all_repositories.find { |r| r.full_name == info.full_name }
+
+          if repo.present?
+            log.heading 'Repository delete'
+            log.kv 'Repository Name', info.repo_name
+            log.kv 'Repository Full Name', info.full_name
+            log.kv 'Organization Name', info.organization if info.organization
+            success = delete_api.delete_repository(info.full_name, organization: info.organization)
+            log.info "Repository: #{info.full_name} deleted" if success
+            log.error "Repository: #{info.full_name} was not deleted" unless success
+            # system("open -a 'Google Chrome' #{info.link}") if opts[:open]
+          else
+            log.warn 'Repository does not exist, nothing to delete'
+          end
+
+          log_repo_info(info)
+        rescue StandardError => e
+          log.exception(e)
+        end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+        def repo_info(**opts)
+          repo_name     = opts[:name] || self.repo_name
+          repo_name     = repo_name.to_s
+          username      = opts[:username] || user
+          organization  = opts[:organization] || self.organization
+          account       = organization || username
+          full_name     = [account, repo_name].compact.join('/')
+          link          = "https://github.com/#{full_name}"
+          ssh_link      = "git@github.com:#{full_name}.git"
+
+          OpenStruct.new(
+            repo_name: repo_name,
+            full_name: full_name,
+            link: link,
+            ssh_link: ssh_link,
+            username: username,
+            organization: organization
+          )
+        end
+
+        private
+
+        def default_github_user
+          KExt::Github.configuration.user
+        end
+
+        def create_api
+          token = KExt::Github.configuration.personal_access_token
+          KExt::Github::Api.instance(token)
+        end
+
+        def delete_api
+          token = KExt::Github.configuration.personal_access_token_delete
+          KExt::Github::Api.instance(token)
+        end
+
+        def log_repo_info(info)
+          log.kv 'SSH', info.ssh_link
+          log.kv 'HTTPS', info.git_link
+          log.kv 'GITHUB', KUtil.console.hyperlink(info.link, info.link)
+
+          # log.json repo.to_h
         end
       end
     end

data/lib/k_director/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KDirector
-  VERSION = '0.5.0'
+  VERSION = '0.7.0'
 end

data/lib/k_director.rb

@@ -3,11 +3,13 @@
 require 'k_log'
 require 'k_util'
 require 'k_builder'
+require 'k_ext/github'
 
 require_relative 'k_director/version'
 require_relative 'k_director/builders/actions_builder'
 require_relative 'k_director/directors/base_director'
 require_relative 'k_director/directors/child_director'
+require_relative 'k_director/directors/data'
 require_relative 'k_director/dsls/children/blueprint'
 require_relative 'k_director/dsls/children/github'
 

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "k_director",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "k_director",
-      "version": "0.5.0",
+      "version": "0.7.0",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.1",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k_director",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Command line and CI/CD tools for k_director",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_director
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_log
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
+- !ruby/object:Gem::Dependency
+  name: k_ext-github
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: k_util
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +83,6 @@ files:
 - ".githooks/commit-msg"
 - ".githooks/pre-commit"
 - ".github/workflows/main.yml"
-- ".github/workflows/semver.yml"
 - ".gitignore"
 - ".releaserc.json"
 - ".rspec"

data/.github/workflows/semver.yml

@@ -1,54 +0,0 @@
-name: SemVer
-on:
-  workflow_run:
-    workflows: ["Build Application"]
-    branches: [main]
-    types:
-      - completed
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-
-      # - uses: hmarr/debug-action@v2 # TURN on ENV DEBUG
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        id: cache-node-modules
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Install semantic-release dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: npm ci
-
-        # SEE MORE: https://github.com/semantic-release/semantic-release/issues/753
-      - name: Run SemVer
-        run: npm run release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
-
-      # - name: Slack notify new version created
-      #   if: success()
-      #   uses: rtCamp/action-slack-notify@v2
-      #   env:
-      #     SLACK_CHANNEL: klueless-repos
-      #     SLACK_COLOR: '#00ff00'
-      #     SLACK_ICON: https://avatars.githubusercontent.com/u/2956762?s=64&v=4
-      #     SLACK_TITLE: 'New version released on ${{github.repository}}'
-      #     SLACK_MESSAGE: 'git pull'
-      #     SLACK_USERNAME: klueless-io
-      #     SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}