idonethis-cli 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad72f615c54b128363ee1c9fd8699c959e1a8ab4
-  data.tar.gz: 4ca4a45b5f536128f08f6539f770c48a4ca3aefd
+  metadata.gz: 39ea043466d1cea8537c68e88e79328c7aaeadba
+  data.tar.gz: de281215fdcaa551d955ecedbbb65f04ac66c06f
 SHA512:
-  metadata.gz: ab930ebcf25bce33c13366ff66389c7356bc57940ab688aa2ca469efcea2d047bf834b527dc7d5d5700abde63fcbb0179ee22ee940797bb1d6b91e0598f3f2f2
-  data.tar.gz: e50373789f9eaffa75133cc1e0dc747bcb6fa06c3faebb8d40d26765b4e325e9a6d7e40cdcaf4a7587e80f78815b10937d39d9ff517a1104b770be9c5e4551f6
+  metadata.gz: aa299c2246ce2f707bab10444dde810740a8d324b553c491e577e1fdfe1b8f9e4a4db2e52c59806fd66f11c8a3dc41cfaee4409b4eee9e664cf83fef9221c2ca
+  data.tar.gz: 25d51e60620ec46dbfc5ce3616ec9f80c93f3a431bcdf09eedbf0802e185015a86ded4a7af18c9f7c642da56c567d6b86833bb4f26ca11c44d4f909658f52a74

data/lib/adapters/cli.rb

@@ -9,84 +9,17 @@ module Idonethis::Adapters
   class Cli
     class << self
       def run(argv={})
-        args = parse(argv)
-      
-        command,*rest = argv
-
-        command = "help" unless command
-        
-        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.call "args: #{args}, command: #{command}, rest: #{rest}"
-        
-        use_case = choose command.to_sym, rest
-
-        unless use_case
-          log.call "No command <#{command.to_sym}> found"
-          return
-        end
-
-        use_case.call credential, args
-      end
-      
-      private 
-      
-      def choose(command, opts)
-       use_cases = {
-          list:   Idonethis::UseCases::List.method(:apply),
-          new:    Idonethis::UseCases::New.method(:apply),
-          config: Idonethis::UseCases::Config.method(:apply),
-          git:    ->(_, args) { Idonethis::UseCases::Git.apply(_, args.merge(git: Idonethis::Adapters::Git, view: ->(msg) { puts msg }, fs: Idonethis::Adapters::IO::DirectoryInfo))},
-          help:   ->(credential, args) { puts "TODO: implement help" }
-        }
-        
-        if command == :list && opts.include?("teams")
-          return ->(credential, args) { 
-            Idonethis::UseCases::Teams.apply(credential, args.merge(view: Idonethis::Adapters::Views::Cli::Teams.method(:apply)))
-          }          
-        end
-        
-        use_case = use_cases[command]
-      end
-      
-      def choose_log(args={})
-        args[:verbose] == true ? ->(msg){puts "[LOG] #{msg}"} : ->(_){}
-      end 
-      
-      def parse(argv={})
-        args = {}
-
-        require 'optparse'
-        
-        OptionParser.new do |opts|
-          opts.banner = "Usage: command [options]"
-
-          opts.on("-v", "--verbose", "Run verbosely") do |v|
-            args[:verbose] = v
-          end
-
-          opts.on("-m MESSAGE", "Message") do |m|
-            args[:message] = m
-          end
-
-          opts.on("-d", "Dry run") do |_|
-            args[:dry_run] = true
-          end
-          
-          opts.on("-t TEAM", "--team TEAM" "Run against this team") do |team_name|
-            args[:team] = team_name
-          end
-
-          opts.on("-s WHEN", "--since WHEN" "Show git commits since when") do |value|
-            args[:since] = value
-          end
-        end.parse!
-        
-        args
+        adapters = {
+          internet: Idonethis::Adapters::Internet,
+          git:      Idonethis::Adapters::Git,
+          fs:       Idonethis::Adapters::IO::DirectoryInfo,
+          views:    { list: Idonethis::Adapters::Views::Cli::List.method(:apply)},
+          settings: Settings,
+          log:      ->(msg){puts "[LOG] #{msg}"}}
+
+        Idonethis::UseCases::Cli.apply argv, adapters
       end
     end
   end
 end
+     

data/lib/idonethis/cli/version.rb

@@ -1,5 +1,5 @@
 module Idonethis
   module Cli
-    VERSION = "0.13.3"
+    VERSION = "0.14.0"
   end
 end

data/lib/idonethis/use_cases/cli.rb

@@ -0,0 +1,87 @@
+module Idonethis::UseCases
+  class Cli
+    class << self
+      def apply(argv={}, adapters={})
+        args = parse(argv)
+      
+        command,*rest = argv
+
+        command = "help" unless command
+
+        log      = args[:verbose] == true ? adapters[:log] : ->(_){} 
+        internet = adapters[:internet]
+        views    = adapters[:views]    || fail("You need to supply the :views adapter")
+        settings = adapters[:settings] || fail("You need to supply the :settings adapters")
+        
+        args.merge!({ opts: rest, log: log, internet: internet, view: views[:list]})
+
+        log.call "args: #{args}, command: #{command}, rest: #{rest}"
+        
+        use_case = choose command.to_sym, adapters, rest 
+
+        unless use_case
+          log.call "No command <#{command.to_sym}> found"
+          return
+        end
+
+        use_case.call settings.credential, args
+      end
+      
+      private 
+      
+      def choose(command, adapters, opts)
+       use_cases = {
+          list:   Idonethis::UseCases::List.method(:apply),
+          new:    Idonethis::UseCases::New.method(:apply),
+          config: Idonethis::UseCases::Config.method(:apply),
+          git:    ->(_, args) { Idonethis::UseCases::Git.apply(_, args.merge(git: adapters[:git], view: ->(msg) { puts msg }, fs: adapters[:fs]))},
+          help:   ->(credential, args) { puts "TODO: implement help" }
+        }
+        
+        if command == :list && opts.include?("teams")
+          return ->(credential, args) { 
+            Idonethis::UseCases::Teams.apply(credential, args.merge(view: views[:teans]))
+          }          
+        end
+        
+        use_case = use_cases[command]
+      end
+      
+      def choose_log(args={})
+        args[:verbose] == true ? ->(msg){puts "[LOG] #{msg}"} : ->(_){}
+      end 
+      
+      def parse(argv={})
+        args = {}
+
+        require 'optparse'
+        
+        OptionParser.new do |opts|
+          opts.banner = "Usage: command [options]"
+
+          opts.on("-v", "--verbose", "Run verbosely") do |v|
+            args[:verbose] = v
+          end
+
+          opts.on("-m MESSAGE", "Message") do |m|
+            args[:message] = m
+          end
+
+          opts.on("-d", "Dry run") do |_|
+            args[:dry_run] = true
+          end
+          
+          opts.on("-t TEAM", "--team TEAM" "Run against this team") do |team_name|
+            args[:team] = team_name
+          end
+
+          opts.on("-s WHEN", "--since WHEN" "Show git commits since when") do |value|
+            args[:since] = value
+          end
+        end.parse!
+        
+        args
+      end
+    end
+  end
+end

data/lib/idonethis/use_cases/git.rb

@@ -30,7 +30,7 @@ module Idonethis::UseCases
 
       def summarise(git, view, since, *dirs)
         dirs.map do |dir|
-          commits = git.commits(dir, since).map{|it| %Q{[#{date_from(it)}] #{it.message}}}        
+          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-- ")}}
         end.join "\n\n"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idonethis-cli
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - Ben Biddington
@@ -108,6 +108,7 @@ files:
 - lib/idonethis/cli/version.rb
 - lib/idonethis/index.rb
 - lib/idonethis/settings_file.rb
+- lib/idonethis/use_cases/cli.rb
 - lib/idonethis/use_cases/config.rb
 - lib/idonethis/use_cases/git.rb
 - lib/idonethis/use_cases/list.rb