idonethis-cli 0.12.0 → 0.13.0

data/lib/idonethis/settings_file.rb

@@ -1,11 +1,11 @@
-module Idonethis
-  class SettingsFile
-    class << self
-      def exists?; File.exists?(path); end
-
-      def path
-        @@path ||= File.expand_path("~/.idonethis.settings")
-      end
-    end
-  end
-end
+module Idonethis
+  class SettingsFile
+    class << self
+      def exists?; File.exists?(path); end
+
+      def path
+        @@path ||= File.expand_path("~/.idonethis.settings")
+      end
+    end
+  end
+end

data/lib/idonethis/use_cases/config.rb

@@ -1,40 +1,40 @@
-module Idonethis::UseCases
-  module Config
-    class << self
-      def apply(_, args={})
-        log       = args[:log]  || fail("You need to supply :log adapter")
-        
-        log.call "args: #{args}"
-
-        require 'yaml'
-
-        settings = File.exists?(filename) ? YAML.load_file(filename) : {}
-
-        token = (args[:opts].map{|it| it.match /user.token=(.+)/}.compact || []).first
-
-        if token
-          File.open filename, "w+" do |f|
-            f.puts(settings.merge({token: token[1]}).to_yaml)
-          end
-        end
-
-        team = (args[:opts].map{|it| it.match /user.team=(.+)/}.compact || []).first
-
-        if team
-          File.open filename, "w+" do |f|
-            f.puts(settings.merge({team: team[1]}).to_yaml)
-          end
-        end
-
-        puts "Settings saved to <#{filename}>"
-      end
-
-      private
-
-      def filename
-        require 'settings_file' 
-        Idonethis::SettingsFile.path
-      end
-    end
-  end
-end
+module Idonethis::UseCases
+  module Config
+    class << self
+      def apply(_, args={})
+        log       = args[:log]  || fail("You need to supply :log adapter")
+        
+        log.call "args: #{args}"
+
+        require 'yaml'
+
+        settings = File.exists?(filename) ? YAML.load_file(filename) : {}
+
+        token = (args[:opts].map{|it| it.match /user.token=(.+)/}.compact || []).first
+
+        if token
+          File.open filename, "w+" do |f|
+            f.puts(settings.merge({token: token[1]}).to_yaml)
+          end
+        end
+
+        team = (args[:opts].map{|it| it.match /user.team=(.+)/}.compact || []).first
+
+        if team
+          File.open filename, "w+" do |f|
+            f.puts(settings.merge({team: team[1]}).to_yaml)
+          end
+        end
+
+        puts "Settings saved to <#{filename}>"
+      end
+
+      private
+
+      def filename
+        require 'settings_file' 
+        Idonethis::SettingsFile.path
+      end
+    end
+  end
+end

data/lib/idonethis/use_cases/git.rb

@@ -1,74 +1,48 @@
-module Idonethis::UseCases
-  module Git
-    class << self
-      def apply(credential, args={})
-        log = args[:log] || fail("You need to supply :log adapter")
-
-        log.call args
-
-        opts = args[:opts]
-        
-        dir = opts.any? ? File.expand_path(opts.first) : File.expand_path(".")
-
-        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 today\n\n"
-
-          summarise *dirs_that_have_changed_today
-            
-          puts ""
-        else
-          puts "Scanning the current directory <#{dir}>\n\n"
-          summarise dir
-        end
-      end
-
-      def summarise(*dirs)
-        dirs.each do |dir|
-          summary = commit_summary(dir)
-          puts %Q{#{Pathname.new(dir).basename} (#{summary.size}):\n-- #{summary.join("\n-- ")}}
-        end
-      end
-
-      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 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').map{|it| %Q{[#{it.date.strftime("%H:%M")}] #{it.message}}}
-      end
-    end
-  end
-end
+module Idonethis::UseCases
+  module Git
+    class << self
+      def apply(_, args={})
+        log   = args[:log]   || fail("You need to supply :log adapter")
+        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'
+
+        log.call args
+
+        opts = args[:opts] || []
+        
+        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)
+        
+          view.call "Scanning dir <#{dir}>, which has <#{dirs_that_have_changed_today.size}> repositories that have changed today\n\n"
+        end
+
+        view.call summarise(git, view, since, *dirs)
+        view.call ""
+      end
+
+      def summarise(git, view, since, *dirs)
+        dirs.map do |dir|
+          commits = git.commits(dir, since).map{|it| %Q{[#{date_from(it)}] #{it.message}}}        
+          %Q{#{Pathname.new(dir).basename} (#{commits.size}):\n\n-- #{commits.join("\n-- ")}}
+        end.join "\n\n"
+      end
+
+      def date_from(commit)
+        return commit.date.strftime("%d %b, %H:%M") unless today?(commit.date, Time.now)
+        commit.date.strftime("%H:%M")
+      end
+
+      def today?(time, now)
+        time.year == now.year && time.month == now.month && time.day == now.day
+      end
+    end
+  end
+end

data/lib/idonethis/use_cases/list.rb

@@ -1,65 +1,65 @@
-module Idonethis::UseCases
-  module List
-    class << self
-      def apply(credential, args={})
-        log = args[:log] || fail("You need to supply :log adapter")
-        view = args[:view] || fail("You need to supply :view adapter")
-
-        list = get(credential, log, args).tap{|result| log.call(result)}
-        
-        view.call list
-      end
-
-      private
-      
-      def get(credential, log, args)
-        result = []
-        page = 1
-        
-        loop do
-          reply = get_page(page, credential, log, args)
-
-          result += reply["results"]
-
-          page += 1
-
-          break if reply["next"].nil?
-        end
-        
-        result
-      end
-
-      def get_page(page, credential, log, args) # https://idonethis.com/api/v0.1/dones/
-        params = {"order_by" => "-created", "page_size" => 100, "page" => page}.
-          merge(done_date_from(args)).
-          merge({team: (args[:team] || credential[:team])})
-
-        url = Idonethis::Index.dones(params)
-
-        log.call "url: #{url}"
-        
-        internet = args[:internet] || fail("You need to supply :internet adapter")
-         
-        parse internet.get(url, { "Authorization" => "Token #{credential[:token]}", accept: "application/json"})
-      end
-
-      def done_date_from(args)
-        opts = args[:opts] || []
-      
-        if opts.include?("week")
-          return { done_date_after: (Time.now - (7*24*60*60)).strftime("%F") }
-        end
-        
-        intersection = opts & %W{ today yesterday }
-
-        return intersection.empty? ? { done_date: 'today' } : { done_date: intersection.first }
-      end
-
-      def parse(reply)
-        require 'json'
-        
-        JSON.parse(reply.body)
-      end
-    end
-  end
-end
+module Idonethis::UseCases
+  module List
+    class << self
+      def apply(credential, args={})
+        log = args[:log] || fail("You need to supply :log adapter")
+        view = args[:view] || fail("You need to supply :view adapter")
+
+        list = get(credential, log, args).tap{|result| log.call(result)}
+        
+        view.call list
+      end
+
+      private
+      
+      def get(credential, log, args)
+        result = []
+        page = 1
+        
+        loop do
+          reply = get_page(page, credential, log, args)
+
+          result += reply["results"]
+
+          page += 1
+
+          break if reply["next"].nil?
+        end
+        
+        result
+      end
+
+      def get_page(page, credential, log, args) # https://idonethis.com/api/v0.1/dones/
+        params = {"order_by" => "-created", "page_size" => 100, "page" => page}.
+          merge(done_date_from(args)).
+          merge({team: (args[:team] || credential[:team])})
+
+        url = Idonethis::Index.dones(params)
+
+        log.call "url: #{url}"
+        
+        internet = args[:internet] || fail("You need to supply :internet adapter")
+         
+        parse internet.get(url, { "Authorization" => "Token #{credential[:token]}", accept: "application/json"})
+      end
+
+      def done_date_from(args)
+        opts = args[:opts] || []
+      
+        if opts.include?("week")
+          return { done_date_after: (Time.now - (7*24*60*60)).strftime("%F") }
+        end
+        
+        intersection = opts & %W{ today yesterday }
+
+        return intersection.empty? ? { done_date: 'today' } : { done_date: intersection.first }
+      end
+
+      def parse(reply)
+        require 'json'
+        
+        JSON.parse(reply.body)
+      end
+    end
+  end
+end

data/lib/idonethis/use_cases/new.rb

@@ -1,29 +1,29 @@
-module Idonethis::UseCases
-  module New
-    class << self
-      def apply(credential, args={})
-        log       = args[:log] || fail("You need to supply :internet adapter")
-        internet  = args[:internet] || fail("You need to supply :internet adapter")
-        team      = args[:team]
-        
-        log.call "args: #{args}"
-        log.call "overriding team <#{credential[:team]}> with <#{team}>"
-        
-        parse internet.post(
-          Idonethis::Index.dones,
-          { "Authorization" => "Token #{credential[:token]}", accept: "application/json"},
-          { 
-            "raw_text"  => args[:message], 
-            "team"      => (team || credential[:team])})
-      end
-
-      private
-
-      def parse(reply)
-        require 'json'
-        
-        JSON.parse(reply.body)
-      end
-    end
-  end
+module Idonethis::UseCases
+  module New
+    class << self
+      def apply(credential, args={})
+        log       = args[:log] || fail("You need to supply :internet adapter")
+        internet  = args[:internet] || fail("You need to supply :internet adapter")
+        team      = args[:team]
+        
+        log.call "args: #{args}"
+        log.call "overriding team <#{credential[:team]}> with <#{team}>"
+        
+        parse internet.post(
+          Idonethis::Index.dones,
+          { "Authorization" => "Token #{credential[:token]}", accept: "application/json"},
+          { 
+            "raw_text"  => args[:message], 
+            "team"      => (team || credential[:team])})
+      end
+
+      private
+
+      def parse(reply)
+        require 'json'
+        
+        JSON.parse(reply.body)
+      end
+    end
+  end
 end

data/lib/idonethis/use_cases/teams.rb

@@ -1,49 +1,49 @@
-module Idonethis::UseCases
-  module Teams
-    class << self
-      def apply(credential, args={})
-        log   = args[:log] || fail("You need to supply :log adapter")
-        view  = args[:view] || fail("You need to supply :view adapter")
-
-        list = get(credential, log, args).tap{|result| log.call(result)}
-        
-        view.call list
-      end
-
-      private
-      
-      def get(credential, log, args)
-        result = []
-        page = 1
-        
-        loop do
-          reply = get_page(page, credential, log, args)
-
-          result += reply["results"]
-
-          page += 1
-
-          break if reply["next"].nil?
-        end
-        
-        result
-      end
-
-      def get_page(page, credential, log, args) # https://idonethis.com/api/v0.1/teams/
-        url = Idonethis::Index.teams
-
-        log.call "url: #{url}"
-        
-        internet = args[:internet] || fail("You need to supply :internet adapter")
-         
-        parse internet.get(url, { "Authorization" => "Token #{credential[:token]}", accept: "application/json"})
-      end
-
-      def parse(reply)
-        require 'json'
-        
-        JSON.parse(reply.body)
-      end
-    end
-  end
-end
+module Idonethis::UseCases
+  module Teams
+    class << self
+      def apply(credential, args={})
+        log   = args[:log] || fail("You need to supply :log adapter")
+        view  = args[:view] || fail("You need to supply :view adapter")
+
+        list = get(credential, log, args).tap{|result| log.call(result)}
+        
+        view.call list
+      end
+
+      private
+      
+      def get(credential, log, args)
+        result = []
+        page = 1
+        
+        loop do
+          reply = get_page(page, credential, log, args)
+
+          result += reply["results"]
+
+          page += 1
+
+          break if reply["next"].nil?
+        end
+        
+        result
+      end
+
+      def get_page(page, credential, log, args) # https://idonethis.com/api/v0.1/teams/
+        url = Idonethis::Index.teams
+
+        log.call "url: #{url}"
+        
+        internet = args[:internet] || fail("You need to supply :internet adapter")
+         
+        parse internet.get(url, { "Authorization" => "Token #{credential[:token]}", accept: "application/json"})
+      end
+
+      def parse(reply)
+        require 'json'
+        
+        JSON.parse(reply.body)
+      end
+    end
+  end
+end