squared 0.4.19 → 0.5.0

data/lib/squared/workspace.rb

@@ -10,7 +10,7 @@ module Squared
           if id.is_a?(Symbol)
             project id
           else
-            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id) }
+            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id, __dir__) }
           end
         end
         ret.size == 1 ? ret.first : ret

data/squared.gemspec

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-version = File.read(File.join(__dir__, "lib/squared/version.rb"))[/\bVERSION = '(.+)'$/, 1]
+require_relative "lib/squared/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "squared"
-  spec.version       = version
+  spec.version       = Squared::VERSION
   spec.authors       = ["An Pham"]
   spec.email         = ["anpham6@gmail.com"]
 
   spec.summary       = %q{Rake task generator for managing multi-language workspaces.}
   spec.description   = %q{Rake task generator for managing multi-language workspaces.}
-  spec.homepage      = "https://github.com/anpham6/squared-ruby"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.homepage      = "https://github.com/anpham6/squared"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   spec.licenses      = ["BSD-3-Clause"]
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
   spec.files         = Dir["lib/**/*"] +
-                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.md README.ruby.md squared.gemspec]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.5.0
 platform: ruby
 authors:
 - An Pham
@@ -75,11 +75,11 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- README.ruby.md
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
 - lib/squared/common/base.rb
-- lib/squared/common/class.rb
 - lib/squared/common/format.rb
 - lib/squared/common/prompt.rb
 - lib/squared/common/shell.rb
@@ -101,15 +101,14 @@ files:
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - lib/squared/workspace/support.rb
-- lib/squared/workspace/support/base.rb
 - lib/squared/workspace/support/data.rb
 - squared.gemspec
-homepage: https://github.com/anpham6/squared-ruby
+homepage: https://github.com/anpham6/squared
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/anpham6/squared-ruby
-  source_code_uri: https://github.com/anpham6/squared-ruby
+  homepage_uri: https://github.com/anpham6/squared
+  source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
 rdoc_options: []
 require_paths:
@@ -118,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []

data/lib/squared/common/class.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-require 'set'
-require 'forwardable'
-
-module Squared
-  module Common
-    class SymSet
-      extend Forwardable
-
-      def self.to_s
-        super[/[^:]+\z/, 0]
-      end
-
-      def_delegators :@data, :+, :each, :each_with_index, :entries, :merge, :include?
-
-      def initialize(data = [])
-        @data = Set.new(data)
-      end
-
-      def add(val)
-        @data.add(val.to_sym)
-      end
-
-      def to_a
-        @data.to_a.freeze
-      end
-
-      def to_s
-        @data.to_s.sub('Set', SymSet.to_s)
-      end
-
-      alias inspect to_s
-    end
-
-    class JoinSet < Set
-      def self.to_s
-        super[/[^:]+\z/, 0]
-      end
-
-      attr_reader :delim
-
-      def initialize(data = [], delim: ' ')
-        super(data.compact)
-        @delim = delim
-      end
-
-      def last(val, pat)
-        (@last ||= []).push([val, pat, $1]) if val =~ pat
-        self << val
-      end
-
-      def pass(&blk)
-        ret = to_a.map!(&:to_s).reject(&:empty?)
-        @last&.each do |val, pat, key|
-          i = []
-          j = nil
-          ret.each_with_index do |opt, index|
-            if opt == val
-              j = index
-            elsif j && opt[pat, 1] == key
-              i << index
-            end
-          end
-          next unless j && !i.empty?
-
-          val = ret[j]
-          cur = j
-          i.each do |k|
-            ret[cur] = ret[k]
-            cur = k
-          end
-          ret[i.last] = val
-        end
-        block_given? ? ret.reject(&blk) : ret
-      end
-
-      def and(*args)
-        self << '&&'
-        merge(args)
-      end
-
-      def or(*args)
-        self << '||'
-        merge(args)
-      end
-
-      def with(*args, &blk)
-        temp('&&', *args, &blk)
-      end
-
-      def temp(*args, &blk)
-        args.compact!
-        ret = pass(&blk)
-        ret = Set.new(ret.concat(args)).to_a unless args.empty?
-        ret.join(@delim)
-      end
-
-      def done
-        ret = to_s
-        clear
-        ret
-      end
-
-      def to_s
-        pass.join(@delim)
-      end
-    end
-  end
-end

data/lib/squared/workspace/support/base.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Squared
-  module Workspace
-    module Support
-      class << self
-        def hashobj
-          Hash.new { |data, key| data[key] = {} }
-        end
-
-        def hashlist
-          Hash.new { |data, key| data[key] = [] }
-        end
-      end
-    end
-  end
-end