classifieds 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a16234fab1931047beac73eb8b3f11c4db7ecf4
-  data.tar.gz: e53323aee4d7707d55e1523f7b7a362e83add621
+  metadata.gz: 6f25849b631ac6f189e627d469dd412ef2d9ea26
+  data.tar.gz: 3e54f421ac4c4066f8b2dcea00197cfbf7cdc9b4
 SHA512:
-  metadata.gz: e4445650f29ee0fdb032ec11092d5a8750faf878bfe576eaabd6eddd7860c41813fea0ace3ed95178e661c5a6ee9de17e1c4939e809102fb0335d5a5dcd2168b
-  data.tar.gz: 3c86bd19806f5e72f4536a215a9a7937bfbfdfd6e8facae57998f1ccfe10a24496199d4899c94ac4a17aead00930014dc5da04190975a6ff45462f3d255dd23f
+  metadata.gz: 4018fd92068baae18dbc40d335a068ed11e135887c81df27c1ba0a1624b9fb2467a03be59d6c70ba071b07218de2011b0839335774216b5b033af5b3c9e9bd96
+  data.tar.gz: 0aebb7f8bc7d4525785b32024372eacd64c241ebf76cb6a56775c82196afb8dccd028e5927cf3a4f6018cf01a2afb902d1267c0e049361ed554563a8f6664db1

data/lib/classifieds.rb

@@ -1,4 +1,5 @@
 require 'classifieds/exception'
+require 'classifieds/utils'
 require 'classifieds/parser'
 require 'classifieds/encryptor'
 require 'classifieds/main'

data/lib/classifieds/main.rb

@@ -2,7 +2,6 @@ require 'digest/sha1'
 require 'openssl'
 require 'base64'
 require 'fileutils'
-require 'find'
 
 require 'safe_colorize'
 
@@ -10,10 +9,11 @@ require 'thor'
 
 module Classifieds
   class Main < Thor
+    include Utils
     using SafeColorize
 
     def initialize(*args)
-      unless classifieds?
+      unless classifieds_repository?
         STDERR.puts "#{SOURCE_FILE} is not found in this repository".color(:red)
         exit 1
       end
@@ -157,53 +157,5 @@ module Classifieds
         retype_password
       end
     end
-
-    def classifieds
-      Parser.parse(File.read(File.join(root_directory, SOURCE_FILE)).chomp)
-    end
-
-    def encrypt_data(data)
-      encryptor = Encryptor.new(@password, root_directory.split('/').pop)
-      encryptor.encrypt(data)
-    end
-
-    def decrypt_data(data)
-      encryptor = Encryptor.new(@password, root_directory.split('/').pop)
-      encryptor.decrypt(data)
-    end
-
-    def root_directory
-      @root_directory ||=
-        begin
-          target_directory = File.expand_path(Dir.pwd)
-          until target_directory == '/' do
-            Find.find(target_directory) do |path|
-              return target_directory if path =~ /#{Regexp.escape(SOURCE_FILE)}$/
-              Find.prune if path =~ %r|^#{target_directory}/|
-            end
-            target_directory = File.expand_path('..', target_directory)
-          end
-
-          nil
-        end
-    end
-
-    def classifieds?
-      !!root_directory
-    end
-
-    def keygenerated?
-      File.exists?(File.join(root_directory, PUBLIC_KEY_PATH)) && File.exists?(File.join(root_directory, COMMON_KEY_PATH))
-    end
-
-    def encrypted?(file)
-      File.open(file, 'r') do |f|
-        !!f.read(@prefix.size).to_s.match(/\A#{@prefix}\z/)
-      end
-    end
-
-    def decrypted?(file)
-      !encrypted?(file)
-    end
   end
 end

data/lib/classifieds/parser.rb

@@ -1,62 +1,66 @@
 module Classifieds
   class Parser
-    def self.parse(text)
-      lines = text.each_line.map(&:chomp)
-      result = lines.each_with_object([]) do |line, array|
-        target = detect_target(line)
+    class << self
+      include Utils
 
-        case target
-        when Array
-          if classifieds_ignore?(line)
-            target.each do |file|
-              array.delete(file)
+      def parse(text)
+        lines = text.each_line.map(&:chomp)
+        result = lines.each_with_object([]) do |line, array|
+          target = detect_target(line)
+
+          case target
+          when Array
+            if classifieds_ignore?(line)
+              target.each do |file|
+                array.delete(file)
+              end
+            else
+              array.concat(target)
+            end
+          when String
+            if classifieds_ignore?(line)
+              array.delete(target)
+            else
+              array << target
             end
-          else
-            array.concat(target)
-          end
-        when String
-          if classifieds_ignore?(line)
-            array.delete(target)
-          else
-            array << target
           end
         end
-      end
 
-      result
-    end
+        result
+      end
 
-    def self.detect_target(string)
-      path = string.match(/^!?(.+)/)[1]
-      absolute_path = File.join(Dir.pwd, path)
+      def detect_target(string)
+        path = string.match(/^!?(.+)/)[1]
+        absolute_path = File.join(root_directory, path)
 
-      # Dir.glob notation
-      if absolute_path.include?('*')
-        recursive_glob(absolute_path)
-      else
-        case File.ftype(path)
-        when 'file'
-          absolute_path
-        when 'directory'
-          recursive_glob(File.join(absolute_path, '*'))
+        # Dir.glob notation
+        if absolute_path.include?('*')
+          recursive_glob(absolute_path)
         else
-          raise ParseError, "invalid file type: #{string}"
+          case File.ftype(absolute_path)
+          when 'file'
+            absolute_path
+          when 'directory'
+            recursive_glob(File.join(absolute_path, '*'))
+          else
+            raise ParseError, "invalid file type: #{string}"
+          end
         end
+      rescue Errno::ENOENT
       end
-    rescue Errno::ENOENT
-    end
 
-    def self.classifieds_ignore?(string)
-      string.start_with?('!')
-    end
+      def classifieds_ignore?(string)
+        string.start_with?('!')
+      end
 
-    def self.recursive_glob(pattern)
-      Dir.glob(pattern).each_with_object([]) do |path, array|
-        case File.ftype(path)
-        when 'file'
-          array << path
-        when 'directory'
-          array.concat(recursive_glob(File.join(path, '*')))
+      def recursive_glob(pattern)
+        Dir.glob(pattern).each_with_object([]) do |absolute_path, array|
+          case File.ftype(absolute_path)
+          when 'file'
+            array << absolute_path
+          when 'directory'
+            array.concat(recursive_glob(File.join(absolute_path, '*')))
+          end
         end
       end
     end

data/lib/classifieds/utils.rb

@@ -0,0 +1,53 @@
+require 'find'
+
+module Classifieds
+  module Utils
+    def classifieds
+      Parser.parse(File.read(File.join(root_directory, SOURCE_FILE)).chomp)
+    end
+
+    def classifieds_repository?
+      !!root_directory
+    end
+
+    def keygenerated?
+      File.exists?(File.join(root_directory, PUBLIC_KEY_PATH)) && File.exists?(File.join(root_directory, COMMON_KEY_PATH))
+    end
+
+    def root_directory
+      @root_directory ||=
+        begin
+          target_directory = File.expand_path(Dir.pwd)
+          until target_directory == '/' do
+            Find.find(target_directory) do |path|
+              return target_directory if path =~ %r|/#{Regexp.escape(SOURCE_FILE)}$|
+              Find.prune if path =~ %r|^#{target_directory}/|
+            end
+            target_directory = File.expand_path('..', target_directory)
+          end
+
+          nil
+        end
+    end
+
+    def encrypt_data(data)
+      encryptor = Encryptor.new(@password, root_directory.split('/').pop)
+      encryptor.encrypt(data)
+    end
+
+    def decrypt_data(data)
+      encryptor = Encryptor.new(@password, root_directory.split('/').pop)
+      encryptor.decrypt(data)
+    end
+
+    def encrypted?(file)
+      File.open(file, 'r') do |f|
+        !!f.read(@prefix.size).to_s.match(/\A#{@prefix}\z/)
+      end
+    end
+
+    def decrypted?(file)
+      !encrypted?(file)
+    end
+  end
+end

data/lib/classifieds/version.rb

@@ -1,3 +1,3 @@
 module Classifieds
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classifieds
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - kaihar4
@@ -88,6 +88,7 @@ files:
 - lib/classifieds/exception.rb
 - lib/classifieds/main.rb
 - lib/classifieds/parser.rb
+- lib/classifieds/utils.rb
 - lib/classifieds/version.rb
 homepage: https://github.com/kaihar4/classifieds
 licenses: