ossy 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293d5356dff91ea8e81f4743a6d3b4a5e3a1811b1c3fe2e58ae44d741ea06bee
-  data.tar.gz: 5cfb961445bff9d039d42deac7a559eb43d9ed322f7c442e75f65d6ed3c749ca
+  metadata.gz: '09293736b8853ce4851c0a079a9f95bf747481919f49048448ed8b22dae77a27'
+  data.tar.gz: 5307d372e0f89aabb53d9c6370f752f5caf2a15e45ef3cf2f558cee2fc9070eb
 SHA512:
-  metadata.gz: 4d8ded74f12c33f88f184ff43f7452710e29b5a22d8247335076f2784783c259a3d2e7382bef8b652821acfe4b186a258c94e7c442d7d9443645d3372761b0f6
-  data.tar.gz: e4d08d31c1cbb34f8da36a316603d89a7f3c7d2bb453b9c5e3425993e0e849650da1f021e7ba288dc863a6c1dedfb5a05b9d47414f8f6d0104257eaceec9f9f3
+  metadata.gz: 7874aa0794c7f9a005a630ec37282af64940e1d78750cd16d6e978902ecf3ea27303a9c99679db37861dff38f6edd28ced9db690f5013937a43dc503bd86dd2f
+  data.tar.gz: 916b47d21be438a82c41e74795f30800d8c854c48278cb540ecc2c4354f091f96f55f54b598df2f03119e9e2d7fa71af19083765f55d86bb3e74a8c4a319e68d

data/lib/ossy/cli/changelogs/update.rb

@@ -18,7 +18,7 @@ module Ossy
         KEYS = %w[version summary date fixed added changed].freeze
 
         def call(config_path:, message:)
-          attrs = YAML.load(message)
+          attrs = YAML.safe_load(message)
           target = YAML.load_file(config_path)
 
           version = attrs["version"] || target[0]["version"]

data/lib/ossy/cli/commands.rb

@@ -22,6 +22,8 @@ module Ossy
 
       require "ossy/cli/templates/compile"
 
+      require "ossy/cli/metrics/rubocop"
+
       register "github", aliases: %w[gh] do |github|
         github.register "workflow", Github::Workflow, aliases: %w[w]
         github.register "membership", Github::Membership, aliases: %w[m]
@@ -46,6 +48,10 @@ module Ossy
       register "configs", aliases: %w[c] do |configs|
         configs.register "merge", Configs::Merge, aliases: %w[m]
       end
+
+      register "metrics", aliases: %w[m] do |configs|
+        configs.register "rubocop", Metrics::Rubocop, aliases: %w[rc]
+      end
     end
   end
 end

data/lib/ossy/cli/configs/merge.rb

@@ -16,7 +16,7 @@ module Ossy
         argument :output_path, required: true, desc: "The path to the output file"
 
         option :identifiers, required: false, default: "",
-          desc: "Key identifier that should be used for merging arrays of hashes"
+                             desc: "Key identifier that should be used for merging arrays of hashes"
 
         def call(source_path:, target_path:, output_path:, **opts)
           puts "Merging #{source_path} + #{target_path} into #{output_path}"
@@ -49,9 +49,11 @@ module Ossy
                 arr
                   .map
                   .with_index { |el, idx|
-                    (after = el.delete("_after")) ?
-                      [el, arr.index(arr.detect { |a| a[id].eql?(after) }) + 1] :
+                    if (after = el.delete("_after"))
+                      [el, arr.index(arr.detect { |a| a[id].eql?(after) }) + 1]
+                    else
                       [el, idx]
+                    end
                   }.sort_by(&:last).map(&:first)
               else
                 (val1 + val2).uniq

data/lib/ossy/cli/github/tagger.rb

@@ -17,8 +17,12 @@ module Ossy
         def call(repo:, tag:)
           result = client.tagger(repo: repo, tag: tag)
 
-          if result && result[:verified].equal?(true)
-            puts result[:tagger]["name"]
+          return unless result
+
+          tagger = result[:tagger]
+
+          if tagger["email"].include?("users.noreply.github.com") || result[:verified].equal?(true)
+            puts tagger["name"]
           end
         end
       end

data/lib/ossy/cli/metrics/rubocop.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "ossy/cli/commands/core"
+require "ossy/import"
+require "ossy/release"
+
+require "yaml"
+require "tilt"
+require "ostruct"
+
+module Ossy
+  module CLI
+    module Metrics
+      class Rubocop < Commands::Core
+        include Import[run_rubocop: "engine.rubocop.run"]
+
+        desc "Runs rubocop"
+
+        argument :path, required: true, desc: "The path to file(s)"
+        option :format, required: true, desc: "Output format"
+        option :do_exit, required: false,
+                         desc: "Whether the command should exit with the same status as rubocop"
+        option :silence, required: false,
+                         desc: "Whether the rubocop output should be displayed"
+
+        def call(path:, silence: "false", do_exit: "true", args: [], **opts)
+          result, output = run_rubocop.(path: path, args: args, **opts)
+
+          warn output if silence.eql?("false") && !result.success?
+
+          exit(result.exitstatus) if do_exit.eql?("true")
+
+          [result, output]
+        end
+      end
+    end
+  end
+end

data/lib/ossy/cli/releases/generate.rb

@@ -37,6 +37,8 @@ module Ossy
         argument :output_path, required: true, desc: "The path to the output md file"
         argument :template_path, required: true, desc: "The path to the changelog ERB template"
 
+        option :data_path, required: false, desc: "Optional path to additional data yaml file"
+
         def call(config_path:, output_path:, template_path:, data_path: nil)
           puts "Generating #{output_path} from #{config_path} using #{template_path}"
 

data/lib/ossy/container.rb

@@ -7,7 +7,7 @@ require "ossy/types"
 
 module Ossy
   class Container < Dry::System::Container
-    use :env, inferrer: proc { ENV.fetch("OSSY_ENV") { "development" }.to_sym }
+    use :env, inferrer: proc { ENV.fetch("OSSY_ENV", "development").to_sym }
 
     configure do |config|
       config.root = Pathname(__dir__).join("../../")

data/lib/ossy/engine/rubocop/run.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require "open3"
+
+require "ossy/cli/commands/core"
+require "ossy/struct"
+
+module Ossy
+  module Engine
+    module Rubocop
+      # {
+      #    "metadata" : {
+      #       "ruby_platform" : "x86_64-darwin20",
+      #       "ruby_version" : "2.7.2",
+      #       "ruby_engine" : "ruby",
+      #       "ruby_patchlevel" : "137",
+      #       "rubocop_version" : "1.6.1"
+      #    },
+      #    "files" : [
+      #       {
+      #          "offenses" : [],
+      #          "path" : "spec/spec_helper.rb"
+      #       }
+      #    ],
+      #    "summary" : {
+      #       "target_file_count" : 1,
+      #       "inspected_file_count" : 1,
+      #       "offense_count" : 0
+      #    }
+      # }
+      #
+      # # json["files"] element
+      # {"path"=>"spec/fixtures/rubocop/bad.rb",
+      #  "offenses"=>
+      #   [{"severity"=>"convention",
+      #     "message"=> "blablabla",
+      #     "cop_name"=>"Style/StringLiterals",
+      #     "corrected"=>false,
+      #     "correctable"=>true,
+      #     "location"=>
+      #      {"start_line"=>3,
+      #       "start_column"=>1,
+      #       "last_line"=>3,
+      #       "last_column"=>30,
+      #       "length"=>30,
+      #       "line"=>3,
+      #       "column"=>1}}]}
+      class Result < Ossy::Struct
+        attribute :summary do
+          attribute :offense_count, Types::Integer
+        end
+
+        def self.build(json)
+          klass =
+            case json["summary"]["offense_count"]
+            in 0 then Success
+            in 1.. then Failure
+            end
+          klass.new(json)
+        end
+
+        def failure?
+          !success?
+        end
+      end
+
+      class Success < Result
+        def success?
+          true
+        end
+      end
+
+      class Failure < Result
+        attribute :files, Types::Array do
+          attribute :path, Types::String
+          attribute :offenses, Types::Array do
+            attribute :severity, Types::String
+            attribute :cop_name, Types::String
+            attribute :location do
+              attribute :start_line, Types::Integer
+              attribute :start_column, Types::Integer
+              attribute :last_line, Types::Integer
+              attribute :last_column, Types::Integer
+              attribute :line, Types::Integer
+              attribute :column, Types::Integer
+            end
+          end
+        end
+
+        def success?
+          false
+        end
+      end
+
+      class Run < Ossy::CLI::Commands::Core
+        option :path, desc: "Path to file(s)"
+        option :format, desc: "Path to file(s)"
+
+        def call(path:, format: "json", args: [])
+          extra_opts = args.join(" ")
+          result, output = exec("rubocop #{path} --format #{format} #{extra_opts}".strip)
+
+          case format
+          when "json" then Result.build(JSON.parse(output))
+          else
+            [result, output]
+          end
+        end
+
+        def exec(cmd, opts = {})
+          Open3.popen3(cmd, opts) do |_stdin, stdout, _stderr, wait_thr|
+            [wait_thr.value, stdout.read]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ossy/github/client.rb

@@ -75,7 +75,7 @@ module Ossy
 
       def http
         @http ||= Faraday.new(url: BASE_URL, headers: headers) do |conn|
-          conn.basic_auth(settings.github_login, settings.github_token)
+          conn.request(:basic_auth, settings.github_login, settings.github_token)
         end
       end
 

data/lib/ossy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ossy
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ossy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -64,20 +64,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +219,11 @@ files:
 - lib/ossy/cli/github/tagger.rb
 - lib/ossy/cli/github/update_file.rb
 - lib/ossy/cli/github/workflow.rb
+- lib/ossy/cli/metrics/rubocop.rb
 - lib/ossy/cli/releases/generate.rb
 - lib/ossy/cli/templates/compile.rb
 - lib/ossy/container.rb
+- lib/ossy/engine/rubocop/run.rb
 - lib/ossy/github/client.rb
 - lib/ossy/github/workflow.rb
 - lib/ossy/import.rb
@@ -232,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Ossy is your ruby gem maintenance helper