runcom 5.1.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1307693958bb9052b260a4fc4cf5761ba0f2ef4d44575fd04a12494d08510d
-  data.tar.gz: 02d95767c848462cf42b696ab71df54c1612c32d62f1957c76e7ebb7c1bc4e54
+  metadata.gz: 2c36440a5f6b7c7e5e9bc63457ff04ce4f03a2bb888ebf5ddd3294b6fbb554ed
+  data.tar.gz: 7e15a92472a4ecf47e591e244965439b79337d17c98db9a651a626ec73adcc8d
 SHA512:
-  metadata.gz: f93e673db789725f9f832df5e73ec3830ae1ffdf4d094d5e788efb515176cea6c486ff90355eb5016ca4e53dbd00c5c64aa749dcd519795054c816a06016e951
-  data.tar.gz: acbd17ec8415a2d917eb87434c89e60bd91ca0efef20b96e729e7f0d50e6c5fa969fb1dfa7565a423f5b77752e55e78e94f3c1631914beb78ab8aec32d17f592
+  metadata.gz: 36cb0e69cb446658acd3c812f21909b5dfbfb2e42c37b89b50f1bf8b0bfa910110768dc77ab1d5510c61d1c0e298b3ca4e926e62aaef14a569a520706a9b9bbd
+  data.tar.gz: a787c56d515d8462db7453a692e60031dee3e5e91109acb110619e7e76ad944962443fbf3b2873cf3db634bb401c629f7d671dcc654b8e4db6b68b3708a79ae8

data/lib/runcom.rb

@@ -4,7 +4,9 @@ require "xdg"
 require "runcom/identity"
 require "runcom/errors/base"
 require "runcom/errors/syntax"
-require "runcom/paths/friendly"
-require "runcom/config"
+require "runcom/paths/home"
+require "runcom/paths/common"
+require "runcom/context"
 require "runcom/cache"
+require "runcom/config"
 require "runcom/data"

data/lib/runcom/cache.rb

@@ -1,31 +1,22 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 module Runcom
   # A developer friendly wrapper of XDG cache.
-  Cache = Struct.new :name, :home, :environment, keyword_init: true do
+  class Cache
     extend Forwardable
 
-    delegate %i[inspect] => :cache
-
-    def initialize *arguments
-      super
+    DEFAULT_CONTEXT = Context.new xdg: XDG::Cache
 
-      self[:home] ||= Runcom::Paths::Friendly
-      self[:environment] ||= ENV
-      @cache = XDG::Cache.new home: home, environment: environment
-      freeze
-    end
-
-    def path
-      paths.find(&:exist?)
-    end
+    delegate %i[relative namespace file_name current all inspect] => :common
 
-    def paths
-      cache.all
+    def initialize path, context: DEFAULT_CONTEXT
+      @common = Paths::Common.new path, context: context
     end
 
     private
 
-    attr_reader :cache
+    attr_reader :common
   end
 end

data/lib/runcom/config.rb

@@ -1,42 +1,27 @@
 # frozen_string_literal: true
 
-require "pathname"
 require "yaml"
 require "refinements/hashes"
 
-# :reek:TooManyInstanceVariables
 module Runcom
   # A developer friendly wrapper of XDG config.
   class Config
     extend Forwardable
     using Refinements::Hashes
 
-    DEFAULT_FILE_NAME = "configuration.yml"
+    DEFAULT_CONTEXT = Context.new xdg: XDG::Config
 
-    delegate %i[inspect] => :config
+    delegate %i[relative namespace file_name current all inspect] => :common
 
-    # rubocop:disable Metrics/ParameterLists
-    def initialize name, environment: ENV, file_name: DEFAULT_FILE_NAME, defaults: {}
-      @name = name
-      @environment = environment
-      @file_name = file_name
-      @defaults = defaults
-      @config = XDG::Config.new home: Runcom::Paths::Friendly, environment: environment
+    def initialize path, defaults: {}, context: DEFAULT_CONTEXT
+      @common = Paths::Common.new path, context: context
+      @context = context
       @settings = defaults.deep_merge process_settings
       freeze
     end
-    # rubocop:enable Metrics/ParameterLists
-
-    def path
-      paths.find(&:exist?)
-    end
-
-    def paths
-      config.all.map { |root| Pathname "#{root}/#{name}/#{file_name}" }
-    end
 
     def merge other
-      self.class.new name, file_name: file_name, defaults: settings.deep_merge(other.to_h)
+      self.class.new common.relative, defaults: settings.deep_merge(other.to_h), context: context
     end
 
     # :reek:FeatureEnvy
@@ -47,7 +32,7 @@ module Runcom
     alias eql? ==
 
     def hash
-      [name, file_name, to_h, self.class].hash
+      [common.relative, to_h, self.class].hash
     end
 
     def to_h
@@ -56,18 +41,19 @@ module Runcom
 
     private
 
-    attr_reader :name, :environment, :file_name, :defaults, :settings, :config
+    attr_reader :common, :context, :settings
 
     def process_settings
       load_settings
     rescue Psych::SyntaxError => error
       raise Errors::Syntax, error.message
     rescue StandardError
-      defaults
+      context.defaults
+      {}
     end
 
     def load_settings
-      yaml = YAML.load_file path
+      yaml = YAML.load_file common.current
       yaml.is_a?(Hash) ? yaml : {}
     end
   end

data/lib/runcom/context.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Runcom
+  # A common context for all XDG custom objects.
+  Context = Struct.new :defaults, :home, :environment, :xdg, keyword_init: true do
+    def initialize *arguments
+      super
+
+      self[:home] ||= Paths::Home
+      self[:environment] ||= ENV
+      self[:xdg] = xdg.new home: home, environment: environment if xdg
+    end
+  end
+end

data/lib/runcom/data.rb

@@ -1,33 +1,22 @@
 # frozen_string_literal: true
 
-require "pathname"
+require "forwardable"
 
 module Runcom
   # A developer friendly wrapper of XDG data.
-  Data = Struct.new :name, :home, :environment, keyword_init: true do
+  class Data
     extend Forwardable
 
-    delegate %i[inspect] => :data
+    DEFAULT_CONTEXT = Context.new xdg: XDG::Data
 
-    def initialize *arguments
-      super
+    delegate %i[relative namespace file_name current all inspect] => :common
 
-      self[:home] ||= Runcom::Paths::Friendly
-      self[:environment] ||= ENV
-      @data = XDG::Data.new home: home, environment: environment
-      freeze
-    end
-
-    def path
-      paths.find(&:exist?)
-    end
-
-    def paths
-      data.all.map { |root| Pathname "#{root}/#{name}" }
+    def initialize path, context: DEFAULT_CONTEXT
+      @common = Paths::Common.new path, context: context
     end
 
     private
 
-    attr_reader :data
+    attr_reader :common
   end
 end

data/lib/runcom/identity.rb

@@ -12,7 +12,7 @@ module Runcom
     end
 
     def self.version
-      "5.1.1"
+      "6.0.0"
     end
 
     def self.version_label

data/lib/runcom/paths/common.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "forwardable"
+require "pathname"
+
+module Runcom
+  module Paths
+    # Provides common path/functionality for all XDG enhanced objects.
+    class Common
+      extend Forwardable
+
+      delegate %i[inspect] => :xdg
+
+      attr_reader :relative
+
+      def initialize relative, context: Context.new
+        @relative = Pathname relative
+        @context = context
+      end
+
+      def namespace
+        relative.parent
+      end
+
+      def file_name
+        relative.basename
+      end
+
+      def current
+        all.find(&:exist?)
+      end
+
+      def all
+        xdg.all.map { |root| root.join relative }
+      end
+
+      private
+
+      attr_reader :context
+
+      def xdg
+        context.xdg
+      end
+    end
+  end
+end

data/lib/runcom/paths/{friendly.rb → home.rb}

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 require "forwardable"
+require "pathname"
 
 module Runcom
   module Paths
-    # A XDG home path with a loose adherence to XDG specification by preferring local path if it
-    # exists, otherwise defaulting to standard computed path.
-    class Friendly
+    # A XDG home path that prefers local over global path.
+    class Home
       extend Forwardable
 
       delegate %i[key value default] => :standard
 
       def initialize pair, environment = ENV
-        @standard = XDG::Paths::Standard.new pair, environment
+        @standard = XDG::Paths::Home.new pair, environment
       end
 
       def dynamic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runcom
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -28,7 +28,7 @@ cert_chain:
   dKvURM+1PwDCzC5tvRwjhUJIizau6+MtkFCvJHmaAj1aZL3odcPejHj5Hxt/0CUW
   y84=
   -----END CERTIFICATE-----
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinements
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: xdg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -72,34 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: gemsmith
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.5'
-- !ruby/object:Gem::Dependency
-  name: git-cop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -120,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -190,70 +162,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.78'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.78'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '1.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '1.37'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.17'
 description: 
 email:
 - brooke@alchemists.io
@@ -268,11 +240,13 @@ files:
 - lib/runcom.rb
 - lib/runcom/cache.rb
 - lib/runcom/config.rb
+- lib/runcom/context.rb
 - lib/runcom/data.rb
 - lib/runcom/errors/base.rb
 - lib/runcom/errors/syntax.rb
 - lib/runcom/identity.rb
-- lib/runcom/paths/friendly.rb
+- lib/runcom/paths/common.rb
+- lib/runcom/paths/home.rb
 homepage: https://github.com/bkuhlmann/runcom
 licenses:
 - Apache-2.0
@@ -288,15 +262,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: An XDG enhanced run command manager for command line interfaces (CLIs).
+summary: An XDG enhanced run command manager for command line interfaces.
 test_files: []