idonethis-cli 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ce6262770b8a91791e7659ef80beee8568a43a
-  data.tar.gz: 740ee4fbcb73ebea819e0e65e77bedb313b506db
+  metadata.gz: 52ddf0a1aa33911dadfdd46c60f4367c3a4f65b5
+  data.tar.gz: e41021117c04ff81be509a3cd7a59f2ef1e8d5d9
 SHA512:
-  metadata.gz: 463a71c6b3d9fd868737df92471ca9961d0c8d3927103b348e19bfc6835d2c5a892a6ca203cb6a680f650ca41d4785d471d38e653867c264872b104f6e90e42e
-  data.tar.gz: 379aad6a548ab0660bce11bd886cff74c60611266b7c5ef5b6b2a2890d23fc7d3ccabfc9404fd8573eae9e2ebad21dadf6d16e1c5003124e0eda0bcc9f157961
+  metadata.gz: b4e5fca05c75c7b6f4cfc566093aa836d935cf004e282f32896d68e7f52cc2f5a2ab097762e2d408a8106b38537a3a2b347dde9b6ae77a62807591cef5f412d5
+  data.tar.gz: 7c780b5eb405768d7c958d41a141652dbbe28504f00a7e66a30f0fdb1d41bec3479ad57b8b34eca5fa07a05f85c3fced5ab0272d768a5da92910e9e210a542e1

data/lib/adapters/git_adapter.rb

@@ -1,24 +1,32 @@
 module Idonethis::Adapters
   module Git
     class << self
-      def commits(dir, since, how_many = 1000)
+      def commits(opts={})
         require 'git'
+
+        fail "opts is supposed to be a hash" unless opts.is_a?(Hash)
         
-        since_when = case since
-                     when 'yesterday'
-                       '1am yesterday'  
-                     when 'today'
-                      '1am'
-                     else
-                       since
-                     end
+        dir, since, how_many, log = defaults.merge(opts).values_at(:dir, :since, :how_many, :log)
+
+        since_when = since.strftime("%d-%b-%Y")
+
+        since_when = '1am' if since == Date.today
+        since_when = '1am yesterday' if since == (Date.today - 1)
+
+        log.call("Using <#{since_when}> as the since date for git")
         
-        ::Git.open(dir).log(how_many).since(since_when)
+        ::Git.open(dir).log(how_many).since("1am #{since_when}")
       end
 
       def repo?(dir)
         File.exists?(File.join(dir, ".git"))
       end
+
+      private
+
+      def defaults
+        { log: ->(msg) {}, how_many: 1000 }
+      end
     end
   end
 end

data/lib/adapters/io/directory_info.rb

@@ -2,25 +2,32 @@ module Idonethis::Adapters
   module IO
     module DirectoryInfo
       class << self
-        def modified_today?(dir)
+        def modified(opts)
+          since,dir,log = defaults.merge(opts).values_at(:since, :dir, :log)
+          
           return [] unless File.exists?(dir)
 
-          now = Time.now
-        
-          _in(dir).select{|it| any_file_inside_changed?(it, now) }
+          _in(dir).select{|it| any_file_inside_changed?(it, since, log) }
         end
-
+        
         private
 
-        def any_file_inside_changed?(dir, now)
+        def any_file_inside_changed?(dir, since, log)
           Dir["#{dir}/**/**"].each do |file|
-            return true if today?(File.ctime(file), now)
+            modified_time = File.mtime(file)
+            modified      = modified_time >= since.to_time
+            
+            log.call("[DirectoryInfo] Checking files inside <#{dir}>. <#{file}> has changed since <#{since}>. Its ctime is <#{modified_time}>") if modified
+
+            return true if modified
           end
           return false
         end
       
-        def today?(time, now)
-          time.year == now.year && time.month == now.month && time.day == now.day
+        def same_day?(a, b)
+          a.year    == b.year &&
+          a.month   == b.month &&
+          a.day     == b.day
         end
 
         def _in(dir)
@@ -29,6 +36,12 @@ module Idonethis::Adapters
             select{|it| File.directory?(File.join(dir, it))}.
             map{   |it| File.expand_path(File.join(dir, it))}
         end
+
+        private
+        
+        def defaults
+          { log: ->(msg) {}}
+        end
       end
     end
   end

data/lib/idonethis/cli/version.rb

@@ -1,5 +1,5 @@
 module Idonethis
   module Cli
-    VERSION = "0.19.1"
+    VERSION = "0.20.0"
   end
 end

data/lib/idonethis/use_cases/git.rb

@@ -8,7 +8,7 @@ module Idonethis::UseCases
         git   = args[:git]   || fail("You need to supply :git adapter")
         view  = args[:view]  || fail("You need to supply :view adapter")
         fs    = args[:fs]    || fail("You need to supply :fs adapter")
-        since = args[:since] || 'today'
+        since = Internal::Dates.from(args[:since]) 
 
         log.call args
 
@@ -16,24 +16,22 @@ module Idonethis::UseCases
         
         dir = opts.any? ? File.expand_path(opts.first) : File.expand_path(".")
 
-        dirs = dir
-        
-        if dir == FileUtils.pwd
-          view.call "Scanning the current directory <#{dir}>\n\n"
-        else
-          dirs = fs.modified_today?(dir).select{|dir| git.repo?(dir) }
-
-          view.call "Scanning dir <#{dir}>, which has <#{dirs.size}> repositories that have changed\n\n"
-        end
+        dirs = fs.modified({since: since, dir: dir, log: log}).select{|dir| git.repo?(dir) }
+          
+        view.call "Scanning dir <#{dir}>, which has <#{dirs.size}> repositories that have changed since <#{since}>\n\n"
 
-        view.call summarise(git, view, since, *dirs)
+        view.call summarise(git, view, since, log, *dirs)
         view.call ""
       end
 
-      def summarise(git, view, since, *dirs)
+      def summarise(git, view, since, log, *dirs)
         dirs.map do |dir|
-          commits = git.commits(dir, since).map{|it| %Q{[#{date_from(it)}] (#{it.author.name}) #{it.message}}}        
-          %Q{#{Pathname.new(dir).basename} (#{commits.size}):\n\n-- #{commits.join("\n-- ")}}
+          begin
+            commits = git.commits({dir: dir, since: since, log: log}).map{|it| %Q{[#{date_from(it)}] (#{it.author.name}) #{it.message}}}        
+            %Q{#{Pathname.new(dir).basename} (#{commits.size}):\n\n-- #{commits.join("\n-- ")}}
+          rescue Exception => e
+            "An error occured trying to query git repo at <#{dir}>"
+          end
         end.join "\n\n"
       end
 
@@ -47,4 +45,29 @@ module Idonethis::UseCases
       end
     end
   end
+
+  module Internal
+    module Dates
+      class << self
+        def from(text)
+          case text
+          when nil
+            Date.today
+          when 'yesterday'
+            (Date.today - 1)
+          when 'today'
+            Date.today
+          when 'one-week-ago'
+            (Date.today - 7)
+          else
+            begin
+              Date.parse(text)
+            rescue
+              Date.today
+            end
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idonethis-cli
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Ben Biddington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler