colorls 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 097f4b900cb2ba4c02c2383c10b11f18f2db0b80
-  data.tar.gz: 22cbb8fbe842c726520305d23b63b19d5f6321af
+  metadata.gz: 2143c29f56d6774467dd21e00da5c06da164577a
+  data.tar.gz: 3ab917069cd931533bf49d2fb75e1572393d80fc
 SHA512:
-  metadata.gz: 1b96024faec532043bf93cb91b0db841b100e3f4d856c3870e264f15fa0c841d74ed112e91b502de9f6065dc74e1e2f62b536b188016c8d42cfaa116cfe0b3e1
-  data.tar.gz: f216edd83aeae29f2323e0b494dc3194116fe06e1e26d78a0761a15ddbe29118b532e3a201990a2a354985723a9040d5247392cbfff590b74e584cac938f7c2d
+  metadata.gz: cb34aaca78b664cc5d9dbd08c75808925c71c28f5be8b98f7bdd7f938001a59f0a6397c7b896980993cf06d6b0d85ee7635dd0ca7aa9dcbd073419b98a64f13a
+  data.tar.gz: 2f1abe88cff446da70966ddaa1f09c31e2d3ae7bb5156a0ca72f30ec9605e52f6d9870d22e50824840436c61cb9e1c6720a0de43359124957b82368612393ed2

data/colorls.gemspec

@@ -17,7 +17,6 @@ ColorLS::POST_INSTALL_MESSAGE = %(
   *******************************************************************
 ).freeze
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'colorls'
   spec.version       = ColorLS::VERSION
@@ -36,11 +35,10 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = ColorLS::POST_INSTALL_MESSAGE
 
-  spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'facets'
   spec.add_runtime_dependency 'filesize'
   spec.add_runtime_dependency 'git'
-  spec.add_runtime_dependency 'ruby-terminfo'
+  spec.add_runtime_dependency 'rainbow'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'diffy'

data/lib/colorls.rb

@@ -1,11 +1,11 @@
-require 'colorize'
 require 'yaml'
 require 'facets'
-require 'terminfo'
 require 'etc'
 require 'filesize'
 require 'git'
+require 'rainbow/ext/string'
 
 require 'colorls/core'
 require 'colorls/flags'
 require 'colorls/load_from_yaml'
+require 'colorls/monkeys'

data/lib/colorls/core.rb

@@ -13,7 +13,7 @@ module ColorLS
       @long         = long
       @tree         = tree
       @git_status   = git_status
-      @screen_width = ::TermInfo.screen_size.last
+      @screen_width = `tput cols`.chomp.to_i
       @colors       = colors
 
       @contents   = init_contents(@input)
@@ -227,21 +227,23 @@ module ColorLS
       relative_path = relative_path==path ? '' : relative_path+'/'
 
       status = Git.open('.').status
-      return '(A)'.colorize(:green) if status.added.keys.any? { |a| a.include?("#{relative_path}#{content}") }
-      return '(U)'.colorize(:red) if status.untracked.keys.any? { |u| u.include?("#{relative_path}#{content}") }
-      return '(C)'.colorize(:yellow) if status.changed.keys.any? { |c| c.include?("#{relative_path}#{content}") }
-      '(-)'
+      git_info_of_file("#{relative_path}#{content}", status)
+    end
+
+    def git_info_of_file(path, status)
+      return '(A)'.colorize(@colors[:added]) if status.added.keys.any? { |a| a.include?(path) }
+      return '(?)'.colorize(@colors[:untracked]) if status.untracked.keys.any? { |u| u.include?(path) }
+      return '(C)'.colorize(@colors[:changed]) if status.changed.keys.any? { |c| c.include?(path) }
+      '   '.colorize(@colors[:unchanged])
     end
 
     def long_info(path, content)
       return '' unless @long
-      @git_status = true
       unless File.exist?("#{path}/#{content}")
-        return '[No Info]'.colorize(@colors[:error]) + ' ' * (39 + @userlength + @grouplength)
+        return '[No Info]'.colorize(@colors[:error]) + ' ' * (38 + @userlength + @grouplength)
       end
       stat = File.stat("#{path}/#{content}")
-      @git_status = false
-      [mode_info(stat), user_info(stat), group_info(stat), size_info(stat), mtime_info(stat),git_info(path,content)]
+      [mode_info(stat), user_info(stat), group_info(stat), size_info(stat), mtime_info(stat)]
         .join('  ')
     end
 
@@ -265,7 +267,7 @@ module ColorLS
 
       [
         long_info(path, content),
-        "#{git_info(path,content)} ",
+        " #{git_info(path,content)} ",
         logo.colorize(color),
         "  #{content.colorize(color)}#{slash?(path, content)}#{symlink_info(path, content)}"
       ].join

data/lib/colorls/monkeys.rb

@@ -0,0 +1,5 @@
+class String
+  def colorize(color)
+    self.color(color.to_sym)
+  end
+end

data/lib/colorls/version.rb

@@ -1,3 +1,3 @@
 module ColorLS
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/lib/yaml/dark_colors.yaml

@@ -1,31 +1,38 @@
 # Main Colors
-unrecognized_file: yellow
-recognized_file:   green
-dir:               blue
+unrecognized_file: gold
+recognized_file:   lime
+dir:               dodgerblue
 
 # Link
 dead_link: red
 link:      cyan
 
 # Access Modes
-write:     magenta
-read:      yellow
-exec:      cyan
-no_access: grey
+write:     darkkhaki
+read:      limegreen
+exec:      red
+no_access: indianred
 
 # Age
-day_old:     yellow
-hour_old:    green
-no_modifier: white
+day_old:     mediumspringgreen
+hour_old:    lime
+no_modifier: seagreen
 
 # File Size
-file_large:  red
-file_medium: yellow
-file_small:  green
+file_large:  orange
+file_medium: gold
+file_small:  peachpuff
 
 # Random
 report: white
-user:   green
+user:   moccasin
 tree:   cyan
 empty:  yellow
-normal: white
+error:  red
+normal: darkkhaki
+
+# Git
+unchanged: forestgreen
+added:     chartreuse    
+changed:   darkorange
+untracked: darkred

data/lib/yaml/light_colors.yaml

@@ -1,7 +1,7 @@
 # Main Colors
-unrecognized_file: yellow
-recognized_file:   green
-dir:               blue
+unrecognized_file: darkred
+recognized_file:   darkgreen
+dir:               navyblue
 
 # Link
 dead_link: red
@@ -9,23 +9,30 @@ link:      cyan
 
 # Access Modes
 write:     red
-read:      yellow
-exec:      blue
+read:      sienna
+exec:      navyblue
 no_access: black
 
 # Age
-day_old:     yellow
-hour_old:    green
+day_old:     darkred
+hour_old:    saddlebrown
 no_modifier: black
 
 # File Size
-file_large:  red
-file_medium: yellow
-file_small:  green
+file_large:  darkred
+file_medium: saddlebrown
+file_small:  black
 
 # Random
 report: black
-user:   green
+user:   darkblue
 tree:   cyan
 empty:  yellow
+error:  red
 normal: black
+
+# Git
+unchanged: darkgreen
+added:     saddlebrown
+changed:   saddlebrown
+untracked: darkred

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colorls
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Athitya Kumar
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-terminfo
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -205,6 +191,7 @@ files:
 - lib/colorls/core.rb
 - lib/colorls/flags.rb
 - lib/colorls/load_from_yaml.rb
+- lib/colorls/monkeys.rb
 - lib/colorls/version.rb
 - lib/tab_complete.sh
 - lib/yaml/dark_colors.yaml