ellipses 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34157f9b5097111044ad7b6dd6ab60ab1bbbc7923f3e1a642b735160631904bd
-  data.tar.gz: eaffa7b909ca61f31fcb7bde01b5af3b38b341451fe577ca2a4aaf96070f399f
+  metadata.gz: eab205b89fc5d9d7a2689c8c707355bb679c4ccc839fe3ffc203426bc2cb028a
+  data.tar.gz: 21c692bf1c0d82f12b5aae17ec83f42a73bf1e3fc5291d027c94a24c0bcc6851
 SHA512:
-  metadata.gz: 479c72da555ee40d94e9fbcbc7482e966167300e2bec6db40f875e88ee7e055ee5aa7636bb4d976c967e428f6eb23a6346a4df247adabac1fe2f68a80454efac
-  data.tar.gz: 99379b733d5aade6d3f2cfa1cfe31ff4a3a5e2f93dd1596b1a0ab004d38255b21f1782418ad80c8219fbbee0af72a0e9444cca6298cec9f0fd5543beb674ab47
+  metadata.gz: 26cd3ba53d1974044448590015f044262545dc51a631f11952db19bcbea18dd21b8aa90e0b658307f3a17bf11fc39d6c4d1141ea0837324a8abf36a2489db8ae
+  data.tar.gz: 843d62d51c2b8916a9f3e416b69b7d51829dd534d35316a3da01889d4be6d52a7b0d9d7a8082c63b5a2b6549d179ea7ac6e975d0fc3342de0b98855f3bb12213

data/BEN/304/260OKU.md

@@ -13,7 +13,11 @@ Proje ayrıntıları için [Geliştirme dokümanlarına](.local/BENİOKU.md) gö
 Kurulum
 --------
 
-Yayınlanan [Gem paketini](https://github.com/alaturka/ellipses/packages) kurmanız yeterlidir.
+Yayınlanan Gem paketini kurmanız yeterlidir.
+
+```sh
+gem install ellipses
+```
 
 Kullanım
 --------

data/CHANGELOG.md

@@ -3,6 +3,19 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+[0.1.0] - 2021-12-25
+--------------------
+
+### Changed
+
+- (client) For LFH, use `.local/etc/src.lock` instead of `.local/var/src.lock`
+
+### Fixed
+
+- (client) Handle dot paths correctly
+
+- (server) Fix error message coming from TOML parser
+
 [0.0.2] - 2021-06-07
 --------------------
 

data/ellipses.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 require 'ellipses/version'
 
-Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |s|
   s.name        = 'ellipses'
   s.author      = 'Recai Oktaş'
   s.email       = 'roktas@gmail.com'
@@ -27,13 +27,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.add_dependency 'dry-cli'
   s.add_dependency 'tomlrb'
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'minitest-focus', '>= 1.2.1'
-  s.add_development_dependency 'minitest-reporters', '>= 1.4.3'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'rubocop-minitest'
-  s.add_development_dependency 'rubocop-performance'
-  s.add_development_dependency 'rubocop-rake'
-  s.add_development_dependency 'rubygems-tasks'
+  s.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

data/lib/ellipses/client/application.rb

@@ -3,12 +3,12 @@
 module Ellipses
   module Client
     class Application
-      attr_reader :config, :repository, :loader
+      attr_reader :loader, :paths, :repository
 
-      def initialize(loader: nil, repository: nil, **options)
-        @config     = Config.new(**options)
-        @loader     = loader     || MetaFile.new
-        @repository = repository || Repository.new(@loader, @config)
+      def initialize(loader: nil, repository: nil, paths: nil)
+        @loader     = loader || MetaFile.new
+        @paths      = locate(paths)
+        @repository = repository || Repository.new(@loader, @paths)
       end
 
       def init(directory)
@@ -66,9 +66,16 @@ module Ellipses
         repository.load(loader)
       end
 
+      def locate(paths)
+        environment            = %w[ELLIPSES_PATH SRCPATH].find { |env| ENV.key? env }
+        paths_from_environment = environment ? ENV[environment].split(':') : []
+
+        [*(paths || []), loader.directory, *paths_from_environment].compact.uniq.select { |path| File.directory?(path) }
+      end
+
       class << self
         %i[init compile compile! decompile decompile! update].each do |meth|
-          define_method(meth) { |*args, **options| new(**options).public_send(meth, *args) }
+          define_method(meth) { |*args, **kwargs| new(**kwargs).public_send(meth, *args) }
         end
       end
     end

data/lib/ellipses/client/meta_file.rb

@@ -5,7 +5,7 @@ require 'json'
 module Ellipses
   module Client
     class MetaFile
-      FILES = %w[.local/var/src.lock src.lock .src.lock].freeze
+      FILES = %w[.local/etc/src.lock src.lock .src.lock].freeze
       EMPTY = "[]\n"
 
       def self.create(directory)

data/lib/ellipses/client/repository.rb

@@ -17,11 +17,11 @@ module Ellipses
 
       private_constant :File
 
-      attr_reader :loader, :config
+      attr_reader :loader, :paths
 
-      def initialize(loader, config)
+      def initialize(loader, paths)
         @loader = loader
-        @config = config
+        @paths  = paths
         @files  = {}
         @memo   = {}
       end
@@ -36,7 +36,7 @@ module Ellipses
 
       def load(loader)
         Dir.chdir loader.directory do
-          loader.read.each { |meta| register_internal(meta.source, Source.from_file(meta.source, config, meta.series)) }
+          loader.read.each { |meta| register_internal(meta.source, Source.from_file(meta.source, paths, meta.series)) }
         end
       end
 
@@ -64,7 +64,7 @@ module Ellipses
           return @files[key].tap { |file| file.registered = true }.source
         end
 
-        register_internal(key, Source.from_file(path, config))
+        register_internal(key, Source.from_file(path, paths))
       end
 
       def unregister(path)

data/lib/ellipses/client/source.rb

@@ -60,9 +60,9 @@ module Ellipses
       end
 
       class << self
-        def from_file(file, config, series = nil)
+        def from_file(file, paths, series = nil)
           lines = File.readlines(Support.file!(file, error: Error)).lazy
-          new lines, series, Server::Application.new(config.paths)
+          new lines, series, Server::Application.new(paths)
         end
       end
     end

data/lib/ellipses/client.rb

@@ -11,7 +11,6 @@ require_relative 'client/source'
 require_relative 'client/meta'
 require_relative 'client/meta_file'
 require_relative 'client/repository'
-require_relative 'client/config'
 require_relative 'client/application'
 
 require_relative 'client/commands'

data/lib/ellipses/server/meta_file.rb

@@ -23,7 +23,11 @@ module Ellipses
       def read
         Meta.new Tomlrb.load_file(@file)
       rescue StandardError => e
-        raise Error, "Error while loading meta file: #{file}: #{e.message}"
+        raise Error, <<~MSG
+          Error loading meta file: #{@file}
+
+             #{e.message.strip}
+        MSG
       end
 
       class << self

data/lib/ellipses/support/entropy.rb

@@ -11,7 +11,7 @@ module Ellipses
         .group_by(&:to_s)
         .values
         .map { |x| x.length / string.length.to_f }
-        .reduce(0) { |e, x| e - x * Math.log2(x) }
+        .reduce(0) { |e, x| e - (x * Math.log2(x)) }
     end
   end
 end

data/lib/ellipses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ellipses
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ellipses
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Recai Oktaş
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -38,132 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-focus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ellipses
 email: roktas@gmail.com
 executables:
@@ -198,7 +72,6 @@ files:
 - lib/ellipses/client/commands/select.rb
 - lib/ellipses/client/commands/substitute.rb
 - lib/ellipses/client/commands/translate.rb
-- lib/ellipses/client/config.rb
 - lib/ellipses/client/directive.rb
 - lib/ellipses/client/error.rb
 - lib/ellipses/client/lines.rb
@@ -239,9 +112,7 @@ homepage: https://alaturka.github.io/ellipses
 licenses:
 - GPL-3.0-or-later
 metadata:
-  changelog_uri: https://github.com/alaturka/ellipses/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/alaturka/ellipses
-  bug_tracker_uri: https://github.com/alaturka/ellipses/issues
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -257,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Ellipses

data/lib/ellipses/client/config.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-
-module Ellipses
-  module Client
-    class Config
-      extend Forwardable
-
-      def_delegators :@config, *%i[paths]
-
-      def initialize(**options)
-        @config = build OpenStruct.new(options.compact)
-      end
-
-      private
-
-      def default_paths
-        environment = %w[ELLIPSES_PATH SRCPATH].find { |env| ENV.key? env }
-        paths       = environment ? ENV[environment].split(':') : []
-
-        ['.', *paths]
-      end
-
-      def build(config)
-        config.paths = default_paths if !config.paths || config.paths.empty?
-        config.paths.compact!
-
-        config
-      end
-    end
-  end
-end