defoker 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca77bb52cce6fe733a892bfc745ace70203d235
-  data.tar.gz: 2f0c6249cd8437a0a81eef2c5a578afe751dd943
+  metadata.gz: 34c984f9722b99072fdbb1315c5d155e581d0deb
+  data.tar.gz: 988dd38c8690bd0381f215b5c795f006a395b7a4
 SHA512:
-  metadata.gz: 18dc9f17bf261c2dced6af3dd92f7242306d7f835981e5ff19aaca54fcf53a83bab87bda9cda1d5d74ccfe35f674221a6faba1689e7a3af06164a114f4df253a
-  data.tar.gz: a1d58f468978180c13769966e46607c1d535f3e3ef07aaf148288c3b739678975c459731e58e971ef73e0b3c2c3d7699afc1fcfccc766a3a0b9ccc0dfbec1b0c
+  metadata.gz: d67be9576e0ea9f93a1dde73fa5b85b85c7639760b49d4e507c5c6ea71a8c829c6b15e8d998adde2e495d218ca34c2c58e17093e5a1c58b5073117057dbb29ef
+  data.tar.gz: 0332c256d22c4f09b79a1579451a914b065d0b5ec21eab62d3f4dc01f0874c9d796bbcaf908ea7327b004f2787855285018b66e13816733fff20ab5305895851

data/README.md

@@ -339,7 +339,42 @@ $ ls -F | grep /
 201410_monthly_report_hoge/
 ~~~
 
+* edit Defokerfile with callback.(type = previous_month, base = monthly_report)
+
+~~~bash
+$ cat Defokerfile
+type :previous_month
+base 'monthly_report'
+callback ->(dir) {
+  p dir
+  File.open("#{dir}/template.txt", 'w:utf-8') { |e|e.puts "template for #{dir}" }
+  File.open("#{dir}/template.rb'" 'w:utf-8') { |e|e.puts "puts '#{dir}'" }
+}
+
+$ tree
+# execute at 20141006
+$ defoker rule -a hige
+"20141006_hige"
+# execute at 20141007
+$ defoker rule -a hoge
+"20141007_hoge"
+# execute at 20141008
+$ defoker rule -a hage
+"20141008_hage"
+$ tree
+┣ 20141006_hige
+┃ ┣ template.rb
+┃ ┗ template.txt
+┣ 20141007_hoge
+┃ ┣ template.rb
+┃ ┗ template.txt
+┗ 20141008_hage
+  ┣ template.rb
+  ┗ template.txt
+~~~
+
 ## History
+* version 0.0.6 : Add callback in Defokerfile.
 * version 0.0.5 : Fix typo in Defokerfile Template.
 * version 0.0.4 : Add init/rule command for rule-output.
 * version 0.0.3 : Fix typo in gemspec.

data/bin/defoker

@@ -6,6 +6,7 @@ require 'defoker/version'
 require 'thor'
 require 'fileutils'
 
+# rubocop:disable ClassLength
 module Defoker
   # = Defoker CLI
   class CLI < Thor
@@ -14,7 +15,7 @@ module Defoker
 
     desc 'init', 'generate Defokerfile template'
     def init
-      Defoker::Core.new.init
+      Defoker::Core.init
       exit(true)
     rescue
       exit(false)
@@ -98,7 +99,14 @@ module Defoker
     option :additional, aliases: 'a'
     desc 'rule', 'create folder by Defokerfile''s rule.'
     def rule
-      defoker_core_single_caller(:rule)
+      additional = options[:additional] ? options[:additional] : ''
+      dir, callback = Defoker::Core.rule(additional: additional)
+      FileUtils.mkdir_p(dir)
+      callback[dir] unless callback.nil?
+      exit(true)
+    rescue => e
+      STDERR.puts(e.backtrace)
+      exit(false)
     end
 
     desc 'version', 'version'
@@ -109,23 +117,26 @@ module Defoker
     private
     def defoker_core_single_caller(method_name)
       additional = options[:additional] ? options[:additional] : ''
-      dir = Defoker::Core.new.send(method_name, additional: additional)
+      dir = Defoker::Core.send(method_name, additional: additional)
       FileUtils.mkdir_p(dir)
       exit(true)
-    rescue
+    rescue => e
+      STDERR.puts(e.backtrace)
       exit(false)
     end
 
     def defoker_core_multi_caller(date, method_name)
       count = options[:count] ? options[:count].to_i : 3
       additional = options[:additional] ? options[:additional] : ''
-      dirs = Defoker::Core.new.send(method_name, date, count: count, additional: additional)
+      dirs = Defoker::Core.send(method_name, date, count: count, additional: additional)
       FileUtils.mkdir_p(dirs)
       exit(true)
-    rescue
+    rescue => e
+      STDERR.puts(e.backtrace)
       exit(false)
     end
   end
 end
 
 Defoker::CLI.start(ARGV)
+# rubocop:enable ClassLength

data/lib/date_base_name.rb

@@ -19,7 +19,7 @@ module Defoker
     #     If you want to get only date, you can omit this option.
     # @return [String] date-based formated name
     #
-    def to_yyyymmdd(date, additional: '')
+    def self.to_yyyymmdd(date, additional: '')
       DateBaseNameValidators.validate_date(date)
       v = date.strftime('%Y%m%d')
       return v if additional.empty?
@@ -45,7 +45,7 @@ module Defoker
     # @param [String] additional additional text.
     #     If you want count get only date, you can omit this option.
     # @return [Array(String)] date-based formated names
-    def to_yyyymmdd_list(day, count: nil, additional: '')
+    def self.to_yyyymmdd_list(day, count: nil, additional: '')
       DateBaseNameValidators.validate_date(day)
       count.times.with_object([]) do |i, memo|
         memo << to_yyyymmdd(day + i, additional: additional)
@@ -66,7 +66,7 @@ module Defoker
     #     If you want to get only month, you can omit this option.
     # @return [String] month-based formated name
     #
-    def to_yyyymm(month, additional: '')
+    def self.to_yyyymm(month, additional: '')
       DateBaseNameValidators.validate_date(month)
       v = month.strftime('%Y%m')
       return v if additional.empty?
@@ -92,7 +92,7 @@ module Defoker
     # @param [String] additional additional text.
     #     If you want to get only month, you can omit this option.
     # @return [Array(String)] month-based formated names
-    def to_yyyymm_list(month, count: 3, additional: '')
+    def self.to_yyyymm_list(month, count: 3, additional: '')
       DateBaseNameValidators.validate_date(month)
       count.times.with_object([]) do |i, memo|
         memo << to_yyyymm(month >> i, additional: additional)
@@ -113,7 +113,7 @@ module Defoker
     #     If you want to get only year, you can omit this option.
     # @return [String] year-based formated name
     #
-    def to_yyyy(year, additional: '')
+    def self.to_yyyy(year, additional: '')
       DateBaseNameValidators.validate_date(year)
       v = year.strftime('%Y')
       return v if additional.empty?
@@ -139,7 +139,7 @@ module Defoker
     # @param [String] additional additional text.
     #     If you want to get only year, you can omit this option.
     # @return [Array(String)] year-based formated names
-    def to_yyyy_list(year, count: 3, additional: '')
+    def self.to_yyyy_list(year, count: 3, additional: '')
       DateBaseNameValidators.validate_date(year)
       count.times.with_object([]) do |i, memo|
         memo << to_yyyy(year >> (i * 12), additional: additional)

data/lib/defoker/version.rb

@@ -1,3 +1,3 @@
 module Defoker
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/defoker_core.rb

@@ -14,16 +14,28 @@ module Defoker
 # example
 # type :this_month
 type :today
+
 # base is optional.
 # example
 # base 'ruby'
 base ''
+
+# callback is ruby's callback(it will call after create folder).
+# Block parameter is foldername string.
+# If you want some action after create folder,
+# comment out following lines and edit your logic.
+
+# callback ->(dir) {
+#    p dir
+#    # create File in your dir
+#    File.open("\#{dir}/some_template_file.txt", "w:utf-8") { |e|e.puts 'some template'}
+# }
   EOS
 
   # Defoker Core
   class Core
     # Generate Defokerfile template
-    def init
+    def self.init
       File.open(DEFOKERFILE_PATH, 'w:utf-8') { |f|f.puts DEFOKERFILE_TEMPLATE }
     end
 
@@ -31,24 +43,24 @@ base ''
     #
     # @param [String] additional additional name
     # @return [String] today folder name
-    def today(additional: '')
-      DateBaseName.new.to_yyyymmdd(Date.today, additional: additional)
+    def self.today(additional: '')
+      DateBaseName.to_yyyymmdd(Date.today, additional: additional)
     end
 
     # Get tomorrow folder name
     #
     # @param [String] additional additional name
     # @return [String] tomorrow folder name
-    def tomorrow(additional: '')
-      DateBaseName.new.to_yyyymmdd(Date.today + 1, additional: additional)
+    def self.tomorrow(additional: '')
+      DateBaseName.to_yyyymmdd(Date.today + 1, additional: additional)
     end
 
     # Get yesterday folder name
     #
     # @param [String] additional additional name
     # @return [String] yesterday folder name
-    def yesterday(additional: '')
-      DateBaseName.new.to_yyyymmdd(Date.today - 1, additional: additional)
+    def self.yesterday(additional: '')
+      DateBaseName.to_yyyymmdd(Date.today - 1, additional: additional)
     end
 
     # Get days folder name list
@@ -56,33 +68,33 @@ base ''
     # @param [String] date yyyymmdd format string
     # @param [String] additional additional name
     # @return [String] yesterday folder name
-    def days(date, count: 3, additional: '')
+    def self.days(date, count: 3, additional: '')
       date = Date.new(date[0..3].to_i, date[4..5].to_i, date[6..7].to_i)
-      DateBaseName.new.to_yyyymmdd_list(date, count: count, additional: additional)
+      DateBaseName.to_yyyymmdd_list(date, count: count, additional: additional)
     end
 
     # Get this month folder name
     #
     # @param [String] additional additional name
     # @return [String] this month folder name
-    def this_month(additional: '')
-      DateBaseName.new.to_yyyymm(Date.today, additional: additional)
+    def self.this_month(additional: '')
+      DateBaseName.to_yyyymm(Date.today, additional: additional)
     end
 
     # Get next month folder name
     #
     # @param [String] additional additional name
     # @return [String] next month folder name
-    def next_month(additional: '')
-      DateBaseName.new.to_yyyymm(Date.today >> 1, additional: additional)
+    def self.next_month(additional: '')
+      DateBaseName.to_yyyymm(Date.today >> 1, additional: additional)
     end
 
     # Get previous month folder name
     #
     # @param [String] additional additional name
     # @return [String] previous month folder name
-    def previous_month(additional: '')
-      DateBaseName.new.to_yyyymm(Date.today << 1, additional: additional)
+    def self.previous_month(additional: '')
+      DateBaseName.to_yyyymm(Date.today << 1, additional: additional)
     end
 
     # Get months folder name list
@@ -90,33 +102,33 @@ base ''
     # @param [String] month yyyymmdd format string
     # @param [String] additional additional name
     # @return [String] yesterday folder name
-    def months(month, count: 3, additional: '')
+    def self.months(month, count: 3, additional: '')
       month = Date.new(month[0..3].to_i, month[4..5].to_i)
-      DateBaseName.new.to_yyyymm_list(month, count: count, additional: additional)
+      DateBaseName.to_yyyymm_list(month, count: count, additional: additional)
     end
 
     # Get this year folder name
     #
     # @param [String] additional additional name
     # @return [String] this year folder name
-    def this_year(additional: '')
-      DateBaseName.new.to_yyyy(Date.today, additional: additional)
+    def self.this_year(additional: '')
+      DateBaseName.to_yyyy(Date.today, additional: additional)
     end
 
     # Get next year folder name
     #
     # @param [String] additional additional name
     # @return [String] next year folder name
-    def next_year(additional: '')
-      DateBaseName.new.to_yyyy(Date.today >> 12, additional: additional)
+    def self.next_year(additional: '')
+      DateBaseName.to_yyyy(Date.today >> 12, additional: additional)
     end
 
     # Get previous year folder name
     #
     # @param [String] additional additional name
     # @return [String] previous year folder name
-    def previous_year(additional: '')
-      DateBaseName.new.to_yyyy(Date.today << 12, additional: additional)
+    def self.previous_year(additional: '')
+      DateBaseName.to_yyyy(Date.today << 12, additional: additional)
     end
 
     # Get years folder name list
@@ -124,25 +136,25 @@ base ''
     # @param [String] year yyyymmdd format string
     # @param [String] additional additional name
     # @return [String] yesterday folder name
-    def years(year, count: 3, additional: '')
+    def self.years(year, count: 3, additional: '')
       year = Date.new(year[0..3].to_i)
-      DateBaseName.new.to_yyyy_list(year, count: count, additional: additional)
+      DateBaseName.to_yyyy_list(year, count: count, additional: additional)
     end
 
     # Create folder by Defokerfile's rule.
     #
     # @param [String] additional additional name
     # @return [String] folder name
-    def rule(additional: '')
+    def self.rule(additional: '')
       dsl = read_dsl
       base = dsl.defoker.base
+      callback = dsl.defoker.callback
       adds = [base, additional].reject(&:empty?)
-      send(dsl.defoker.type, additional: adds.join('_'))
+      dir = send(dsl.defoker.type, additional: adds.join('_'))
+      [dir, callback]
     end
 
-    private
-
-    def read_dsl
+    def self.read_dsl
       dsl = Defoker::Dsl.new
       unless File.exist?(DEFOKERFILE_PATH)
         fail DslNotExistError, "#{DEFOKERFILE_PATH} not exist"
@@ -151,6 +163,7 @@ base ''
       dsl.instance_eval(src)
       dsl
     end
+    private_class_method :read_dsl
   end
 
   class DslNotExistError < StandardError; end

data/lib/defoker_dsl.rb

@@ -7,7 +7,7 @@ module Defoker
     attr_accessor :defoker
 
     # String Define
-    [:type, :base].each do |f|
+    [:type, :base, :callback].each do |f|
       define_method f do |value|
         @defoker.send("#{f}=", value)
       end
@@ -17,6 +17,7 @@ module Defoker
       @defoker = Defoker::DslModel.new
       @defoker.type = ''
       @defoker.base = ''
+      @defoker.callback = nil
     end
   end
 end

data/lib/defoker_dsl_model.rb

@@ -3,9 +3,11 @@
 module Defoker
   # DslModel
   class DslModel
-    # type command
+    # type
     attr_accessor :type
-    # base command
+    # base
     attr_accessor :base
+    # callback
+    attr_accessor :callback
   end
 end