compath 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c86314adbf42083643e131c063cd7419584345c
-  data.tar.gz: 2aab33aef2eafbbb8dd217280c869b2f05a075b2
+  metadata.gz: db1088c56006f4e8bcbfc910a58e7f1b42a1db1f
+  data.tar.gz: 00a2e3283fdfb1e8da6ecb3fb05330df34abfa58
 SHA512:
-  metadata.gz: 549891f66676b7baa8cdf1920e7453df1f18667331ac564181ae7b4a24a23e3343b4f8e45ff256a57f901a1c20be02cf9bc73169f7d4adeeb613f3d4a750bd9b
-  data.tar.gz: d16d0b63491daffd8e57275754f3b78e2aa24f4eaa72351169947544da0cce5c50e5fbbe258bcd9750048282a92627e753f0f01404f3a7e01aab59173317f1b0
+  metadata.gz: 2b62dace41df7c5911709aa5dccd65a7b73258becac6287f990fe93a2bba8511ebb381911c768b1e3d45371075bec39bf66f70c01d546090e70c72168f5b4da2
+  data.tar.gz: 5947e8bd948198cb120acdf10a5e0cb0cce5a6260ddbcba436d0531c2dd1b7b697742f8f21738b87ce7682ce8f67d128f0400a3ccfd283a5c8d067c855a64039

data/.compath.yml

@@ -1,42 +1,8 @@
 ---
-- ".compath.yml":
-    desc: 
-- ".gitignore":
-    desc: 
-- ".rspec":
-    desc: Configuration file for RSpec
-- ".travis.yml":
-    desc: Configuration file for travis
-- bin/:
-    desc: 
-- bin/console:
-    desc: 
-- bin/setup:
-    desc: 
-- compath.gemspec:
-    desc: 
-- exe/:
-    desc: 
-- exe/compath:
-    desc: 
-- Gemfile:
-    desc: 
-- lib/:
-    desc: 
-- lib/compath/:
-    desc: 
-    scan: false
-- lib/compath.rb:
-    desc: 
-- LICENSE.txt:
-    desc: 
-- Rakefile:
-    desc: 
-- README.md:
-    desc: 
-- spec/:
-    desc: 
-- spec/compath_spec.rb:
-    desc: 
-- spec/spec_helper.rb:
-    desc: 
+bin/: 
+exe/: 
+lib/: 
+lib/compath/:
+  desc: 
+  scan: false
+spec/: 

data/lib/compath.rb

@@ -5,7 +5,6 @@ require "pathname"
 require "compath/guide"
 require "compath/guide_book"
 require "compath/finder"
-require "compath/dumper"
 require "compath/path_sorter"
 require "compath/config_loader"
 require "compath/version"

data/lib/compath/cli.rb

@@ -5,6 +5,7 @@ module Compath
       paths = Compath::PathSorter.sort(finder.paths.keys)
 
       guides = paths.map {|path| Compath::Guide.new(path) }
+      guides.select!(&:directory?)
       guide_book = Compath::GuideBook.new(guides)
       if FileTest.exist?('.compath.yml')
         config = Compath::ConfigLoader.load(File.read('.compath.yml'))

data/lib/compath/config_loader.rb

@@ -4,12 +4,21 @@ module Compath
     def load(config)
       conf = YAML.load(config)
 
-      guides = conf.map do |guide_hash|
-        path = guide_hash.keys.first
-        options = guide_hash.values.first
-        options = options.each_with_object({}) do |(key, value), hash|
-          hash[key.to_sym] = value
+      guides = conf.map do |path, guide|
+        if guide.is_a?(Hash)
+          # symbolize keys
+          options = guide.each_with_object({}) do |(key, value), hash|
+            hash[key.to_sym] = value
+          end
+        else
+          # nil or String
+          options = {
+            scan: true,
+            desc: guide,
+          }
         end
+
+        # TODO: Bad interface...
         Guide.new(path, **options)
       end
     end

data/lib/compath/guide.rb

@@ -28,23 +28,11 @@ module Compath
     end
 
     def to_object
-      scan_or_not = if !directory? || @scan_children
-                      {}
-                    else
-                      {
-                        'scan' => false
-                      }
-                    end
-
-      object = {
-                 object_key => {
-                   'desc' => @description
-                 }.merge(scan_or_not)
-               }
-
-      object
+      { object_key => object_value }
     end
 
+    private
+
     def object_key
       if directory?
         pathname.to_s + '/'
@@ -52,5 +40,16 @@ module Compath
         pathname.to_s
       end
     end
+
+    def object_value
+      if !directory? || @scan_children
+        @description
+      else
+        {
+          'desc' => @description,
+          'scan' => @scan_children,
+        }
+      end
+    end
   end
 end

data/lib/compath/guide_book.rb

@@ -20,14 +20,15 @@ module Compath
     end
 
     def publish
-      guides.map do |guide|
+      @index.each_with_object({}) do |(path, guide), hash|
         scan_children = true
         scan_children = guide.ancestors.all? do |ancestor|
           @index[ancestor.to_path].scan_children
         end
         next unless scan_children
-        guide.to_object
-      end.compact
+
+        hash.update(guide.to_object)
+      end
     end
 
     def publish_yaml

data/lib/compath/path_sorter.rb

@@ -1,5 +1,8 @@
 module Compath
   # TODO: Remove Pathname
+  # Sorted files and directories are ordered as below
+  #   1. directory
+  #   2. file
   module PathSorter
     module_function
 

data/lib/compath/version.rb

@@ -1,3 +1,3 @@
 module Compath
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compath
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - meganemura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,6 @@ files:
 - lib/compath.rb
 - lib/compath/cli.rb
 - lib/compath/config_loader.rb
-- lib/compath/dumper.rb
 - lib/compath/finder.rb
 - lib/compath/guide.rb
 - lib/compath/guide_book.rb

data/lib/compath/dumper.rb

@@ -1,23 +0,0 @@
-module Compath
-  class Dumper
-    def initialize(paths)
-      @paths = paths.each_with_object({}) do |path, hash|
-        hash[path] = Guide.new(path)
-      end
-    end
-
-    def dump
-      @paths.values.map do |path|
-        scan_target = true
-        scan_target = path.ancestors.all?(&:scan_children)
-        next unless scan_target
-        path.to_object
-      end.compact
-    end
-    alias_method :dump_hash, :dump
-
-    def dump_yaml
-      YAML.dump(dump_hash)
-    end
-  end
-end