batch_manager 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTBlMjliMWM1NTkyODk0ODkxNjRlYjRlM2FkNTFjNWZlMzZhYmI2OA==
+    NDVkYjIwYTM5NjUxNzliYjE1NDVkNDdmZTg1YmI1ZjRhN2M2NTE5NQ==
   data.tar.gz: !binary |-
-    MWIyMTAyZjEzYjRlMDQzNzU2ZWZlMzU2YzU2MzU2Zjc1MmY3MjI5Nw==
+    MWZmZWNjM2Q0ZDdjNGU2MGRiMjg4Njc0ODg2ZjI5Njk3ZmRjYmFmOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGZjODhjZmYxODgwZWE3ODAxMjFjMmQ3YmY1ZDMxYzMyN2YzMDU4OWNlNzZk
-    ZjRlMDNmNDFiMjdjZGUwNWNmMmIzNDdmNWQ5MTAwYzk0ZmZhZjA3ZTk4MTU3
-    ZjA3NGEzMmNjZDRhZTZhZjc0YjZiNWVhMTZkYTc1MDQ4MGRiN2E=
+    NTZlOWM0ZTg2NzcxN2YzZjQ0ODg2ZDM5NjkwNTFmYTRhOTYzNWY1MmE1OTk4
+    NWIzOGQ1NDMyYTkxMGUyOTA2MmJhNjI3YzQ3YTliOTJhY2U2ZWNhYzJmNDYx
+    NmI0YTdmZDQzMzQzM2ZkYTE1NmEyMTQ1NzA5NjMyMDI5MDc4ODE=
   data.tar.gz: !binary |-
-    MWUzMzEyOWNhM2RhZTU5MjlkZWEzMDk1YTA5M2JhOTAwZDBkOTBkZjczYTAz
-    YWY5NDM1ZThjM2M4ZDM5ODc2Yjg4ZDdmMjZhZDJkNzM0ODUxNDdlZDdkNDgz
-    NmIxZWUzZTliZTVjZDQ5ZDdjZTZmN2NkOGEzYmJlNzhmMTZmYmM=
+    YWQ1Yzk2ODhjMzEwNDQ0YWUxMzcxYzkxNWRiMGIwYjA0OWM0YTdiMTBmMGU3
+    ODZlN2QwNDMzNTExM2IwZmRjOTQ1Zjk1MGYxOTE2ZGE4NDk2NmRhOTAwOGEx
+    M2UxNjI1OTcxYmFmMmIyMjRjY2ZhODBkNTM2MzVlYzk3NDFjMjI=

data/README.rdoc

@@ -1,4 +1,4 @@
-= BatchManager
+= BatchManager {<img src="https://travis-ci.org/cctiger36/batch_manager.png?branch=master" alt="Build Status" />}[https://travis-ci.org/cctiger36/batch_manager] {<img src="https://badge.fury.io/rb/batch_manager.png" alt="Gem Version" />}[http://badge.fury.io/rb/batch_manager]
 
 A rails plugin to manage batch scripts similar to migrations.
 
@@ -33,7 +33,7 @@ You can change the default configuration in config/application.rb
 
 This will generate the file 'test.rb' in the configured batch_dir with default template.
 
-You can look up the template in lib/generators/batch/templates, and modify it for yourself.
+You can find the template in lib/generators/batch/templates, and modify it for yourself.
 
 == Batch Header
 
@@ -61,7 +61,13 @@ Please use this command instead of 'rails runner' to run batch scripts.
 
 == Rake Tasks
 
-  # TODO: rake batch:list
+show all batches
+
+  bundle exec rake batch:list
+
+show the details of batches
+
+  bundle exec rake batch:details
 
 == TODO
 

data/lib/batch_manager/batch_status.rb

@@ -1,10 +1,10 @@
 module BatchManager
   class BatchStatus
-    attr_accessor :name, :created_at, :times_limit, :auto_run, :group_name, :path, :managed
+    include BatchManager::Utils
+    attr_accessor :name, :created_at, :times_limit, :auto_run, :group_name, :managed
 
     def initialize(path)
-      @path = path
-      @name = File.basename(path, ".rb")
+      @name = batch_name(path)
       File.open path do |f|
         f.each_line do |line|
           parse_batch_content line
@@ -30,10 +30,6 @@ module BatchManager
       end
     end
 
-    def to_s
-      # TODO
-    end
-
     def managed?
       @managed
     end

data/lib/batch_manager/executor.rb

@@ -3,7 +3,7 @@ module BatchManager
     include BatchManager::Utils
 
     def self.exec(batch_file, options)
-      batch_file_path = batch_path(batch_file)
+      batch_file_path = batch_full_path(batch_file)
       if File.exist?(batch_file_path)
         batch_status = BatchManager::BatchStatus.new(batch_file_path)
         if options[:force] || batch_status.can_run?

data/lib/batch_manager/monitor.rb

@@ -3,8 +3,20 @@ module BatchManager
     include BatchManager::Utils
 
     class << self
-      def list
-        # TODO
+      def batches
+        arr = []
+        Dir.glob(File.join(BatchManager.batch_dir, "**", "*.rb")).sort.each do |f|
+          arr << batch_name(f)
+        end
+        arr
+      end
+
+      def details
+        status_array = []
+        Dir.glob(File.join(BatchManager.batch_dir, "**", "*.rb")).sort.each do |f|
+          status_array << BatchManager::BatchStatus.new(f)
+        end
+        status_array
       end
 
       def status(file_name)

data/lib/batch_manager/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 module BatchManager
   class Railtie < ::Rails::Railtie
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+      Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
     end
 
     config.batch_manager = ActiveSupport::OrderedOptions.new

data/lib/batch_manager/utils.rb

@@ -6,12 +6,22 @@ module BatchManager
     end
 
     module OverallMethods
-      def batch_path(file)
-        if file.start_with?(::BatchManager.batch_dir)
-          file
+      def batch_name(filename_or_path)
+        if filename_or_path.start_with?(::BatchManager.batch_dir)
+          path = filename_or_path.sub("#{::BatchManager.batch_dir}/", "")
         else
-          File.join(::BatchManager.batch_dir, file) + ".rb"
+          path = filename_or_path
         end
+        path.sub(".rb", "")
+      end
+
+      def batch_full_path(filename_or_path)
+        if filename_or_path.start_with?(::BatchManager.batch_dir)
+          path = filename_or_path
+        else
+          path = File.join(::BatchManager.batch_dir, filename_or_path)
+        end
+        path.end_with?(".rb") ? path : path + ".rb"
       end
     end
   end

data/lib/batch_manager/version.rb

@@ -1,3 +1,3 @@
 module BatchManager
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/generators/batch/batch_generator.rb

@@ -13,7 +13,7 @@ module Rails
       end
 
       def create_batch_file
-        template 'batch.rb', "#{BatchManager.batch_dir}/#{file_name}.rb"
+        template 'batch.rb', File.join(BatchManager.batch_dir, class_path, "#{file_name}.rb")
       end
     end
   end

data/lib/generators/batch_manager/migration/templates/active_record/migration.rb

@@ -3,7 +3,7 @@ class BatchManagerMigration < ActiveRecord::Migration
     create_table :schema_batches do |t|
       t.string :name
       t.integer :ran_times, :default => 0
-      t.string :last_ran_at
+      t.datetime :last_ran_at
     end
     add_index :schema_batches, :name
   end

data/lib/tasks/batch_manager_tasks.rake

@@ -1,6 +1,28 @@
-desc "Execute batch"
 namespace :batch do
+  desc "List all batches"
   task :list do
-    # TODO
+    puts BatchManager::Monitor.batches
+  end
+
+  task :details => :environment do
+    title = "%-12s" % "Managed?"
+    title << "%-50s" % "Name"
+    title << "%10s" % "Ran/Limit"
+    title << "%25s" % "Last run at"
+    title << "%25s" % "Created at"
+    puts title
+    BatchManager::Monitor.details.each do |status|
+      schema_batch = status.schema_batch
+      str = "%-12s" % (status.managed?? "Yes" : "")
+      str << "%-50s" % status.name.truncate(45)
+      str << "%10s" % "#{schema_batch.try(:ran_times).to_i}/#{status.times_limit || 0}"
+      if last_ran_at = schema_batch.try(:last_ran_at)
+        str << "%25s" % last_ran_at.strftime('%Y-%m-%d %H:%M:%S')
+      else
+        str << "%25s" % ""
+      end
+      str << "%25s" % status.created_at.strftime('%Y-%m-%d %H:%M:%S')
+      puts str
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Weihu Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails