codeless_code 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afee543f50db04012a4db1f18ed371f6690178efce9b96a14b57f25154c68ce6
-  data.tar.gz: 2cfab8aa161a6f82e181deadfa3e76866742401f35f577a003e06405e27f1b45
+  metadata.gz: bc18a71aa3e43895db1c702116523d456e8f583efcb341e4c8eb74d7a764a22e
+  data.tar.gz: '05595e53a98c72b33a7d776bdd4f5795ba608d7c6b333b6d6cc6b67308e57828'
 SHA512:
-  metadata.gz: ac74ffd3d88ff3e9e50114e8f0e288e6ebefe95f94e644325326d57bb5c09914df561b94f26143d7e07a63f14433c8dfb03e8863b6fb5627d00ade0efc8fe3fe
-  data.tar.gz: 3e727a22af1ab6f3f7b2eae59ff708016e32673c07de96a7445feafea214e5c0ae28fc1463b50e4b16f8c6e758d54e439321b95679aa0bc05d2766c8ff59d973
+  metadata.gz: a884f539c917ad7d2c9e1a1aac1b11a29abd8f28c4a9cb0d5418cc3a7f9c7602e11ff2d962b796557dce82a4e85e84d350224f18ecefc3e07f87d0c55317c37b
+  data.tar.gz: 4000cd5a1e2613e04c0525fdd382b4c779e4b381b6c90d5b06a805935d545529793358d47794ae58851b215a4412983f6fa4894554ccf02f2c8731d2a0b99527

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/codeless_code.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: codeless_code 0.1.3 ruby lib
+# stub: codeless_code 0.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "codeless_code".freeze
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/codeless_code/catalog.rb

@@ -18,19 +18,17 @@ module CodelessCode
     # extend Forwardable
     include Enumerable
 
-    attr_accessor :root_dir
-
-    def initialize(root_dir: DEFAULT_DATA)
-      self.root_dir = root_dir
+    def initialize(root_dir)
+      @root_dir = root_dir
     end
 
     def languages
-      @languages ||= root_dir.glob('*-*')
-                             .select(&:directory?)
-                             .map { |dir| dir.basename.to_s.split('-').first }
-                             .uniq
-                             .map(&:to_sym)
-                             .sort
+      @languages ||= @root_dir.glob('*-*')
+                              .select(&:directory?)
+                              .map { |dir| dir.basename.to_s.split('-').first }
+                              .uniq
+                              .map(&:to_sym)
+                              .sort
     end
 
     # @return [LanguageSet]
@@ -44,7 +42,7 @@ module CodelessCode
     end
 
     def language_sets
-      languages.map { |lang| LanguageSet.new(lang) }
+      languages.map { |lang| LanguageSet.new(lang, root_dir: @root_dir) }
     end
 
     def fable_sets

data/lib/codeless_code/cli.rb

@@ -31,7 +31,7 @@ module CodelessCode
       elsif options.key?(:version)
         (io || $stdout).puts version_str
       elsif options.key?(:list_translations)
-        Commands::ListTranslations.new(io: io).call
+        Commands::ListTranslations.new(catalog, io: io).call
       else
         filter_fables(io)
       end
@@ -49,15 +49,19 @@ module CodelessCode
       filter = Filters::FromOptions.new(options)
       fallback = options[:trace] ? nil : Formats::Raw
 
-      Commands::FilterFables.new(filter, output_format, io: io,
-                                 fallback_filter: fallback)
-                            .call(&method(:select))
+      cmd = Commands::FilterFables.new(filter, output_format, io: io,
+                                       fallback_filter: fallback)
+      cmd.call(catalog, &method(:select))
     end
 
     def options
       @options ||= Options.new(@command_name, @args)
     end
 
+    def catalog
+      @catalog ||= Catalog.new(options.data_dir)
+    end
+
     def io_open
       if (path = options[:output])
         path == '-' ? $stdout.dup : File.open(path, 'w')

data/lib/codeless_code/commands/filter_fables.rb

@@ -25,8 +25,8 @@ module CodelessCode
         @fallback_filter = fallback_filter
       end
 
-      def call
-        fables = filtered_fables
+      def call(catalog)
+        fables = catalog.select(@filter)
         fables = yield fables if block_given?
 
         case fables.size
@@ -41,11 +41,6 @@ module CodelessCode
 
       private
 
-      # @return [Enumerable<Fable>]
-      def filtered_fables
-        Catalog.new.select(@filter)
-      end
-
       def show(fable)
         if @io.nil? && ENV.key?('PAGER')
           pager(ENV['PAGER'], fable)

data/lib/codeless_code/commands/list_translations.rb

@@ -18,12 +18,13 @@ module CodelessCode
     class ListTranslations
       # @param io [IO] if given, the output will be written to this stream,
       #   otherwise STDOUT will be used
-      def initialize(io: nil)
+      def initialize(catalog, io: nil)
+        @catalog = catalog
         @io = io
       end
 
       def call
-        Catalog.new.language_sets.each do |set|
+        @catalog.language_sets.each do |set|
           translators = set.fable_sets.map(&:translator).sort
           puts format('%s  %s', set.lang, translators.join(', '))
         end

data/lib/codeless_code/filters/from_options.rb

@@ -60,7 +60,7 @@ module CodelessCode
 
       def fallback_lang
         lang = ENV['LANG']&.split(/_|\./)&.first&.downcase&.to_sym
-        Catalog.new.languages.include?(lang) ? lang : :en
+        Catalog.new(@opts.data_dir).languages.include?(lang) ? lang : :en
       end
 
       def non_defaults_enabled?

data/lib/codeless_code/language_set.rb

@@ -25,7 +25,7 @@ module CodelessCode
     attr_accessor :lang, :root_dir
     def_delegator :fable_sets, :each
 
-    def initialize(lang, root_dir: DEFAULT_DATA)
+    def initialize(lang, root_dir:)
       self.lang = lang
       self.root_dir = root_dir
     end

data/lib/codeless_code/options.rb

@@ -47,6 +47,10 @@ module CodelessCode
       !!self[key]
     end
 
+    def data_dir
+      @data_dir ||= self[:path] ? Pathname.new(self[:path]) : DEFAULT_DATA
+    end
+
     def help
       opts(suppress: true).to_s
     end

data/lib/codeless_code/renderers/page.rb

@@ -13,6 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <https://www.gnu.org/licenses/>.
+require 'colorized_string'
+
 module CodelessCode
   module Renderers
     class Page

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeless_code
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jon Sangster