idonethis-cli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7732c6eb7d9765b37d6cf669a2ce808b4d9563ca
-  data.tar.gz: ad003f1a99ae40d0d74cae19545022ff184e1441
+  metadata.gz: 30f5aa9e1c0e1d380417d536f50ad961d469e10f
+  data.tar.gz: e2b4dc443c372988ef7cb77592cd585ba9d53d3b
 SHA512:
-  metadata.gz: eb24e43e8bd7526d8c919c53d4114986f759dd9074a06faca053f6e38733177657abb807f7c65e44d69874d7a2fec8f972a3953b91d5856a4d6912891f8bf59c
-  data.tar.gz: 7c3e268399456085c795284825636f64f5fced2f147a027d0a91ee0ebdca4b572d1ac8dfdeed88886860172799f10a65487aab358e80c747840521b0d1250b70
+  metadata.gz: 365a7684422c9e41c01b181137878b236db31042d192ef7605b2d42f8ecbf7d21ed9657680124481c1b190d2088e412d4db642b5ec0393fc3546106552c4ba8f
+  data.tar.gz: e824be3315ea9ca705c0f3dceb59e7107338d7761f2dd508c559548d354b6d7d5e47dc9dcdf4e9b9c6de65718c186897d7750645cf1ac4cfd4a081fb1daf6927

data/lib/adapters/cli.rb

@@ -11,11 +11,13 @@ module Idonethis::Adapters
         args = parse(argv)
       
         command,*rest = argv
+
+        log = choose_log(args) 
         
         args.merge!({ opts: rest, log: log, internet: Idonethis::Adapters::Internet, view: Idonethis::Adapters::Views::Cli::List.method(:apply)})
         credential = Settings.credential 
 
-        log(args).call "args: #{args}, command: #{command}, rest: #{rest}"
+        log.call "args: #{args}, command: #{command}, rest: #{rest}"
         
         use_cases = {
           list:   Idonethis::UseCases::List.method(:apply),
@@ -37,7 +39,7 @@ module Idonethis::Adapters
       
       private 
       
-      def log(args={})
+      def choose_log(args={})
         args[:verbose] == true ? ->(msg){puts "[LOG] #{msg}"} : ->(_){}
       end 
       

data/lib/idonethis/cli/version.rb

@@ -1,5 +1,5 @@
 module Idonethis
   module Cli
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/idonethis/use_cases/git.rb

@@ -4,31 +4,70 @@ module Idonethis::UseCases
       def apply(credential, args={})
         log = args[:log] || fail("You need to supply :log adapter")
 
-        dir = File.expand_path("..")
+        log.call args
 
-        all_dirs = Dir.entries(dir).reject{|it| ["..", "."].include?(it) }.select{|it| File.directory?(File.join(dir, it))}.map{|it| File.join(dir, it)}
+        opts = args[:opts]
+        
+        dir = opts.any? ? File.expand_path(opts.first) : File.expand_path(".")
 
-        dirs_that_have_changed_today = all_dirs.select{|it| today?(File.mtime(it)) }
+        if opts.any?
+          all_dirs = directories_in(dir)
+          
+          log.call("All directories in <#{dir}>: #{all_dirs}")
+          
+          dirs_that_have_changed_today = all_dirs.select{|it| modified_today?(it, log) }
         
-        puts "Scanning dir <#{dir}>, which has <#{dirs_that_have_changed_today.size}> repositories that have changed\n\n"
+          puts "Scanning dir <#{dir}>, which has <#{dirs_that_have_changed_today.size}> repositories that have changed today\n\n"
+
+          summarise *dirs_that_have_changed_today
+            
+          puts ""
+        else
+          puts "Scanning the current directory <#{dir}>\n\n"
+          summarise dir
+        end
+      end
 
-        dirs_that_have_changed_today.each do |dir|
+      def summarise(*dirs)
+        dirs.each do |dir|
           summary = commit_summary(dir)
-          puts %Q{#{Pathname.new(dir).basename} (#{summary.size}):\n-- #{summary.join("\n-- ")}"}
+          puts %Q{#{Pathname.new(dir).basename} (#{summary.size}):\n-- #{summary.join("\n-- ")}}
         end
+      end
 
-        puts ""
+      def directories_in(dir)
+        Dir.entries(dir).
+          reject{|it| ["..", "."].include?(it) }.
+          select{|it| File.directory?(File.join(dir, it))}.
+          map{   |it| File.expand_path(File.join(dir, it))}
       end
 
-      def today?(time)
+      def modified_today?(dir, log)
+        time = File.ctime(dir)
         now = Time.now
+        
+        any_file_changed_today?(dir, time, now, log).tap do |result|
+          log.call "[#{dir}] Comparing mtime <#{time}> to today <#{now}>. Today? <#{result}>"
+        end
+      end
+
+      def any_file_changed_today?(dir, time, now, log)
+        Dir["#{dir}/**/**"].select do |file|
+          mtime = File.ctime(file)
+          log.call "File <#{file}> has mtime <#{mtime}>"
+          return true if today?(mtime, now)
+        end
+        return false
+      end
+      
+      def today?(time, now)
         time.year == now.year && time.month == now.month && time.day == now.day
       end
 
       def commit_summary(dir)
         require 'git'
         git = ::Git.open(dir)
-        git.log.since('1am').take(10).map{|it| %Q{[#{it.date.strftime("%H:%M")}] #{it.message}}}
+        git.log.since('1am').map{|it| %Q{[#{it.date.strftime("%H:%M")}] #{it.message}}}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idonethis-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ben Biddington