crntb 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7098325dce85f1836393f1a6e509b52cc8dee461
-  data.tar.gz: 641ce5840bdc17aac7f2be6f2d0c084322ab05c8
+  metadata.gz: def18eedf778b1a5c534906f63c3ed9b12a3129f
+  data.tar.gz: a25aed6ca83b0e4a03efc25d54f456d2f29a41bd
 SHA512:
-  metadata.gz: 99cb97810cdeec9ddfe1302226910a1ed2e17dae58c549f5090511d418e44c0ac8c13662bca3b9af1bbe8f68ac16522265bd0852b833621a2157a0b0c1542abf
-  data.tar.gz: bed6742c8ba7f9c110b133aa4730184c9e5ad839fe3da6270ea12cf5758a3e76170767b6f366c46f8bed9db0cc0747870bf5b62a3468d0fe49e8fab81f423bf5
+  metadata.gz: e3328a02999cc990fb254044b11a986feae3bbfe5f54715d3729441ea19cee712c34380934307dfa36a006a8aee34894e4597150f016d6ebcca855a6504e0f6c
+  data.tar.gz: 4921ce724624cd787132c924e7e93f8052c06f724e981b7c680502ca259efea58fae2315234cb4d903b992e4a4f9e86af228acdb1ca34ef5223bc009c4b2f145

data/.circleci/config.yml

@@ -0,0 +1,44 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+       - image: circleci/ruby:2.4.1-node-browsers
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "Gemfile.lock" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            gem install bundler
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            bundle exec rake

data/Gemfile

@@ -4,6 +4,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
 
+gem "crontab", github: 'litencatt/crontab', branch: 'keep-cron-definition'
+
 group :development do
   gem "pry-byebug"
 end

data/Gemfile.lock

@@ -1,7 +1,14 @@
+GIT
+  remote: https://github.com/litencatt/crontab
+  revision: 9c758a82a124f2b83a6e28ffb8cffce608f41844
+  branch: keep-cron-definition
+  specs:
+    crontab (0.0.2)
+
 PATH
   remote: .
   specs:
-    crntb (0.1.0)
+    crntb (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -24,10 +31,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   crntb!
+  crontab!
   minitest
   pry
   pry-byebug
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.5

data/README.md

@@ -0,0 +1,54 @@
+Inspired by http://crontab.homecoded.com/
+
+Convert crontab lines to other format.
+
+### Install
+```
+$ git clone https://github.com/litencatt/crntb
+$ cd /path/to/crntb
+$ bundle install --path vendor/bundle
+```
+
+### Usage
+Convert a line.
+```rb
+$ bin/console
+[1] pry(main)> Crntb.parse("* * * * * foo.sh").to_h
+=> "{\"minute\":\"*\",\"hour\":\"*\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"foo.sh\"}"
+
+[1] pry(main)> Crntb.parse("* * * * * foo.sh").to_json
+=> "{\"minute\":\"*\",\"hour\":\"*\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"foo.sh\"}"
+
+[2] pry(main)> puts Crntb.parse("* * * * * foo.sh").to_chef
+cron 'exec_foo.sh' do
+  minute  "*"
+  hour    "*"
+  day     "*"
+  month   "*"
+  weekday "*"
+  command "foo.sh"
+end
+=> nil
+
+[3] pry(main)> puts Crntb.parse("* * * * * foo.sh").to_whenever
+every '* * * * *' do
+  command "foo.sh"
+end
+=> nil
+```
+
+Convert crontabs written in a file.
+```rb
+$ bin/console
+[1] pry(main)> entries = Crntb.parse_file("./sample.cron")
+
+[2] pry(main)> entries.map{|e| pp e.to_json}
+=> ["{\"minute\":\"0\",\"hour\":\"8,10,12,14,16,18\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"php emptyTrash.php > log.txt\"}",
+ "{\"minute\":\"1-6,9,32\",\"hour\":\"*\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"echo \\\"sample me good\\\" > /etc/tmp/trash.txt\"}",
+ "{\"minute\":\"*\",\"hour\":\"4\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"/etc/init.d/apache2 restart\"}",
+ "{\"minute\":\"*\",\"hour\":\"*\",\"day_of_month\":\"3-4\",\"month\":\"1,4,5\",\"day_of_week\":\"*\",\"command\":\"/etc/init.d/apache2 restart\"}",
+ "{\"minute\":\"*\",\"hour\":\"*\",\"day_of_month\":\"3,5\",\"month\":\"12\",\"day_of_week\":\"1,5,6\",\"command\":\"/etc/init.d/apache2 restart\"}",
+ "{\"minute\":\"10\",\"hour\":\"4\",\"day_of_month\":\"1\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"/root/scripts/backup.sh\"}",
+ "{\"minute\":\"30\",\"hour\":\"3\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"mon\",\"command\":\"cat /proc/meminfo >> /tmp/meminfo\"}",
+ "{\"minute\":\"*\",\"hour\":\"*\",\"day_of_month\":\"*\",\"month\":\"*\",\"day_of_week\":\"*\",\"command\":\"top > test.txt\"}"]
+```

data/Rakefile

@@ -0,0 +1,10 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task :default => :test

data/lib/crntb.rb

@@ -1,12 +1,14 @@
-require 'crntb/file'
-require 'crntb/field'
+require 'crntb/line'
+require 'crontab'
 
 module Crntb
-  def self.parse(file)
-    Crntb::File.parse(file)
+  def self.parse(line)
+    Crntb::Line.new(line)
   end
 
-  def self.parse_line(line)
-    Crntb::Line.new(line).parse
+  def self.parse_file(file)
+    ::File.readlines(file).each_with_object([]) do |line, arr|
+      arr << Crntb::Line.new(line.chomp!)
+    end
   end
 end

data/lib/crntb/line.rb

@@ -0,0 +1,27 @@
+require 'crntb/outputer'
+require 'json'
+
+module Crntb
+  class Line
+    def initialize(line)
+      return if line.empty?
+      @entry = ::Crontab::Entry.parse(line)
+    end
+
+    def to_h
+      Crntb::Outputer::Hash.build(@entry)
+    end
+
+    def to_json
+      to_h.to_json
+    end
+
+    def to_chef
+      Crntb::Outputer::ChefCron.build(@entry)
+    end
+
+    def to_whenever
+      Crntb::Outputer::Whenever.build(@entry)
+    end
+  end
+end

data/lib/crntb/outputer.rb

@@ -0,0 +1,8 @@
+require 'crntb/outputer/hash'
+require 'crntb/outputer/chef_cron'
+require 'crntb/outputer/whenever'
+
+module Crntb
+  module Outputer
+  end
+end

data/lib/crntb/outputer/chef_cron.rb

@@ -0,0 +1,22 @@
+module Crntb
+  module Outputer
+    module ChefCron
+      class << self
+        def build(entry)
+          fields = entry.cron_definition.split(/\s/, 5)
+
+          <<EOS
+cron 'exec_#{entry.command}' do
+  minute  "#{fields[0]}"
+  hour    "#{fields[1]}"
+  day     "#{fields[2]}"
+  month   "#{fields[3]}"
+  weekday "#{fields[4]}"
+  command "#{entry.command}"
+end
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/crntb/outputer/hash.rb

@@ -0,0 +1,20 @@
+module Crntb
+  module Outputer
+    module Hash
+      class << self
+        def build(entry)
+          fields = entry.cron_definition.split(/\s/, 5)
+
+          {
+            "minute":       fields[0],
+            "hour":         fields[1],
+            "day_of_month": fields[2],
+            "month":        fields[3],
+            "day_of_week":  fields[4],
+            "command":      entry.command
+          }
+        end
+      end
+    end
+  end
+end

data/lib/crntb/outputer/text.rb

@@ -0,0 +1,100 @@
+module Crntb
+  module Outputer
+    module Text
+      class << self
+        attr_reader :result, :fields
+
+        def build(fields)
+          @result = ''
+          @fields = fields
+          day_week_month_result
+          min_hour_result
+          %Q{#{@result}\n  run command "#{fields.command}"}
+        end
+
+        def day_week_month_result
+          build_month
+          build_day_of_month
+          build_day_of_week
+        end
+
+        def build_month
+          @result += "in #{fields.month}, on " if fields.month != '*'
+          @result += "every month on " if fields.month == '*' and fields.day_of_month != '*'
+        end
+
+        def build_day_of_month
+          if fields.day_of_month == '*'
+            @result += 'every day ' if fields.day_of_week == '*'
+          else
+            @result += 'the '
+            days = fields.day_of_month.split(',')
+            days.each do |day|
+              case day.to_i
+              when 1
+                @result += "#{day}st,"
+              when 2
+                @result += "#{day}nd,"
+              when 3
+                @result += "#{day}rd,"
+              else
+                @result += "#{day}th,"
+              end
+            end
+            @result.slice!(@result.size - 1, 1)
+            @result += ' '
+          end
+        end
+
+        def build_day_of_week
+          if fields.day_of_week != '*'
+            @result += 'and on ' if fields.day_of_month != '*'
+            @result += fields.day_of_week + ' '
+          end
+        end
+
+        def min_hour_result
+          hour_collections = fields.hour.split(',')
+          min_collections = fields.minute.split(',')
+          if hour_collections.length > 1 or hour_collections[0].to_i.to_s == hour_collections[0]
+            # input exp. ["1,2"]
+            if min_collections.length > 1 or min_collections[0].to_i.to_s == min_collections[0]
+              @result += 'at '
+              hour_collections.each do |hour_collection|
+                min_collections.each do |min_collection|
+                  @result += "%#02d" % hour_collection + ':' + "%#02d" % min_collections + ', '
+                end
+              end
+              @result.slice!(@result.size - 2, 2)
+            else
+              @result += "on #{fields.minute} when hour is ("
+              hour_collections.each do |hour_collection|
+                @result += "%#02d" % hour_collection + ', '
+              end
+              @result.slice!(@result.size - 2, 2)
+              @result += ')'
+            end
+          else
+            # input exp. ["every hour"]
+            if min_collections.length > 1
+              @result += "on #{fields.hour} when minute equals one of ("
+              min_collections.each do |min_collection|
+                @result += "%#02d" % min_collection + ', '
+              end
+              @result.slice!(@result.size - 2, 2)
+              @result += ')'
+            else
+              if fields.hour.to_i.to_s == fields.hour and fields.minute.to_i.to_s == fields.minute
+                @result += "on #{fields.hour}:#{fields.minute}"
+              elsif fields.minute.to_i.to_s == fields.minute
+                @result += "on #{fields.hour} when minute equals " + "%#02d" % fields.minute
+              else
+                @result += "on #{fields.hour} on #{fields.minute}"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/crntb/outputer/whenever.rb

@@ -0,0 +1,15 @@
+module Crntb
+  module Outputer
+    module Whenever
+      class << self
+        def build(entry)
+          <<EOS
+every '#{entry.cron_definition}' do
+  command "#{entry.command}"
+end
+EOS
+        end
+      end
+    end
+  end
+end

data/lib/crntb/version.rb

@@ -1,3 +1,3 @@
 module Crntb
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

data/sample.cron

@@ -1 +1,8 @@
-* * * * *          sample.sh
+0 8,10,12,14,16,18 * * * php emptyTrash.php > log.txt
+1-6,9,32 * * * * echo "sample me good" > /etc/tmp/trash.txt
+* 4 * * * /etc/init.d/apache2 restart
+* * 3-4 1,4,5 * /etc/init.d/apache2 restart
+* * 3,5 12 1,5,6 /etc/init.d/apache2 restart
+10 4 1 * * /root/scripts/backup.sh
+30 3 * * mon cat /proc/meminfo >> /tmp/meminfo
+* * * * * top > test.txt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crntb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - litencatt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,17 +73,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- README.md
+- Rakefile
 - bin/console
 - crntb.gemspec
 - lib/crntb.rb
-- lib/crntb/field.rb
-- lib/crntb/file.rb
+- lib/crntb/line.rb
+- lib/crntb/outputer.rb
+- lib/crntb/outputer/chef_cron.rb
+- lib/crntb/outputer/hash.rb
+- lib/crntb/outputer/text.rb
+- lib/crntb/outputer/whenever.rb
 - lib/crntb/version.rb
 - sample.cron
-- sample.cron1
 homepage: https://github.com/litencatt/crntb
 licenses:
 - MIT
@@ -104,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Crontab format parser

data/lib/crntb/field.rb

@@ -1,202 +0,0 @@
-module Crntb
-  class Field
-    attr_reader :field
-
-    class << self
-      def parse(field)
-        self.new(field).parse
-      end
-    end
-
-    def initialize(field)
-      @field = field
-    end
-
-    def parse
-      #return nil unless valid?
-      return '*' if first_to_last?
-      interpretation
-    end
-
-    # 先頭文字列を処理
-    #   */...
-    #   n...
-    #   それ以降はカンマ区切りでsplitして-はloop処理しての繰り返し
-    def interpretation
-      step_collections = field.split(',')
-      collections = []
-      step_collections.each do |step_collection|
-        # /でsplitした結果
-        step = get_step(step_collection)
-
-        # /が使われてればstep[1]には分割数が来るはず, なければ1
-        # 次のrange処理で使う
-        if step[1] && step[1].match(/^[0-9]+$/)
-          step_size = step[1].to_i
-        else
-          step_size = 1
-        end
-
-        # step[0] : *   => min..max
-        # step[0] : n-m => n..m
-        range = get_range(step[0])
-        if range.length > 1
-          s = range[0].to_i
-          e = range[1].to_i
-          s.step(e, step_size) { |r| collections << r }
-        end
-      end
-      collections.uniq.sort
-      # 曜日や月は文字列にして追加
-      # そうでなければ数字を追加
-      result = collections.inject '' do |res, collection|
-        res += collection.to_s
-        res += ", "
-      end
-      result.slice!(result.size - 2, 2)
-      result
-    end
-
-    def get_collection
-
-    end
-
-    # e.g
-    #   "*/1"     => ["*", "1"]
-    #   "*/1,2-4" => ["*", "1,2-4"]
-    def get_range(value)
-      if value == '*'
-        [field_range.first, field_range.last]
-      else
-        value.split('-')
-      end
-    end
-
-    def get_step(value)
-      value.split('/')
-    end
-
-    def expand_range(collections)
-      result = []
-      collections.each do |collection|
-        if collection.include?('-')
-          min, max = collection.split('-', 2)
-          for i in min..max do
-            result << i
-          end
-        else
-          result << collection
-        end
-      end
-    end
-
-    def first_to_last?
-      field == '*'
-    end
-
-    def range_time?
-    end
-
-    def every_time?
-    end
-
-    private
-
-    def have_asterisk?
-      field.include?('*')
-    end
-
-    def have_hyphen?
-      field.include?('-')
-    end
-
-    def have_slash?
-      field.include?('/')
-    end
-
-    def have_comma?
-      field.include?(',')
-    end
-  end
-
-  class Minute < Field
-    def field_range
-      0..59
-    end
-
-    def parse
-      case field
-      when '*'
-        "every minute"
-      else
-        "when minute equals #{super}"
-      end
-    end
-  end
-
-  class Hour < Field
-    def parse
-      case field
-      when '*'
-        "every hour "
-      else
-        "at #{super}"
-      end
-    end
-
-    def field_range
-      0..23
-    end
-  end
-
-  class DayOfMonth < Field
-    def parse
-      case field
-      when '*'
-        ""
-      else
-        "on the #{super}"
-      end
-
-    end
-
-    def field_range
-      1..31
-    end
-  end
-
-  class Month < Field
-    def parse
-      case field
-      when '*'
-        "every day "
-      else
-        "In #{super}"
-      end
-
-    end
-
-    def field_range
-      1..12
-    end
-  end
-
-  class DayOfWeek < Field
-    def parse
-      case field
-      when '*'
-        ""
-      else
-        "and on #{super}"
-      end
-    end
-
-    def field_range
-      0..7
-    end
-  end
-  class Command < Field
-    def parse
-    end
-  end
-end

data/lib/crntb/file.rb

@@ -1,38 +0,0 @@
-module Crntb
-  class File
-    def self.parse(file)
-      ::File.readlines(file).each do |line|
-        Crntb::Line.new(line).parse
-      end
-    end
-  end
-
-  class Line
-    attr_reader :minute, :hour, :day_of_month, :month, :day_of_week, :command
-
-    def initialize(line)
-        fields = manipuate(line)
-        @minute       = Minute.parse(fields[0])
-        @hour         = Hour.parse(fields[1])
-        @day_of_month = DayOfWeek.parse(fields[2])
-        @month        = Month.parse(fields[3])
-        @day_of_week  = DayOfMonth.parse(fields[4])
-        @command      = fields[5].chomp
-    end
-
-    def parse
-      [
-        day_of_week,
-        month,
-        day_of_month,
-        hour,
-        minute,
-        "\n  exec #{@command}",
-      ].join
-    end
-
-    def manipuate(line)
-      line.split(' ', 6)
-    end
-  end
-end

data/sample.cron1

@@ -1,14 +0,0 @@
-* * * * *          sample.sh && foo.sh && bar.sh
-0 * * * *          sample.sh
-00 * * * *         sample.sh
-*/10 * * * *       sample.sh
-00 05 * * *        sample.sh
-30 08 * * *        sample.sh
-0,30 8-22 * * *    sample.sh
-00,30 * * * *      sample.sh
-00 00 1 * *        sample.sh
-00 01 1 * *        sample.sh
-0 9 25-29 * *      sample.sh
-00 09 13-17 * *    sample.sh
-00 02,05,08 * * *  sample.sh
-30 23 28-31 * *    sample.sh