mcalendar 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b53e3a3204aeaf586f32fd3a8765e5a23bf82815ba9c0288bb4e1fe86507ab6
-  data.tar.gz: 4ee2fdd8a52460874411b9271937428fb21e63f037e1e0dffcf1247288cb3a40
+  metadata.gz: b957b8968e85884abff40ef75462a3061a99fe97d057f8a80c5360a8f1ba11a4
+  data.tar.gz: 508e4d57573f0bc0f0d44634553fe465cdab91efe94138c8385398d39fbf1e68
 SHA512:
-  metadata.gz: 5d9f099a44377cdbb6a366ad04bf1c70e6b5d920ab40c975b72a08d28f02d4e8e48c2dcf306e8d15330a243a6b36ed98a4fdc47d3e2b2d12a72746b14bb2e536
-  data.tar.gz: 35a5ba1a1a7d2de7be98ddacb66bf1c9a60212a2058438d83a592048031e62f01791d4ebd88fa430d2189b6dbb799e499be7652c38927f9408762713f6b0bc1a
+  metadata.gz: 7ec173986099a1c9d4070ccdb424b05093e5b2d70d54831595a6968d6ab7a08c7fa43b684d42986b00135c2455e7ad38d83f9b71ca36efca409f2a7a69e33aef
+  data.tar.gz: 5903ccb62a28c78ff60deb53635d28e8b2c6e401ca8a0f5d471c02b54773da584b3c335679923e20816e14beb8e14630e99ef1e479e930832113316363588770

data/README.md

@@ -30,12 +30,35 @@ When you run the command, the calendar appears on the console. The pdf file is c
 mcalendar
 ```
 
-
 If you want to create a calendar for any month.
 ```
 mcalendar 2020/02
 ```
 
+If you want to output only PDF, use the `-p` option.
+```
+mcalendar 2020/02 -p
+```
+
+Also, If you want to output only console, use the `-c` option.
+```
+mcalendar 2020/02 -c
+```
+
+The default PDF file name is `calendar.pdf`. You can specify any name using the `-n` option.
+```
+mcalendar 2020/02 -n my_calendar.pdf
+```
+
+show help
+```
+>mcalendar -h
+Usage: mcalendar [options]
+    -v, --version                    Show version
+    -p, --pdf                        output pdf
+    -n, --name=NAME                  output pdf name
+    -c, --console                    output console
+```
 
 ## License
 

data/Rakefile

@@ -5,6 +5,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
+  t.options = "-v"
 end
 
 task :default => :test

data/exe/mcalendar

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
 
 require "mcalendar"
+
+Mcalendar::Command.run(ARGV)

data/lib/mcalendar/calendar.rb

@@ -1,13 +1,24 @@
 
 module Mcalendar
+  DEFAULT_PDF_NAME = "calendar.pdf"
+
   class Calendar
     WEEKS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
 
-    def initialize(year, month)
+    def initialize(year, month, pdf_name)
       @first_of_month = Date.new(year, month, 1)
       @end_of_month = Date.new(year, month, -1)
       @days = (1..@end_of_month.day).map {|m| "%2d" % m}
       @first_of_month.wday.times {@days.unshift("  ")}
+      set_pdf_name(pdf_name)
+    end
+    
+    def set_pdf_name(name)
+      if  name.nil? || name.empty?
+        @pdf_name = Mcalendar::DEFAULT_PDF_NAME
+      else
+        @pdf_name = name
+      end
     end
 
     def month_title
@@ -51,7 +62,7 @@ module Mcalendar
           row(0).padding_bottom = 0
         end
       end
-      pdf.render_file "calendar.pdf"
+      pdf.render_file @pdf_name
     end
 
   end

data/lib/mcalendar/command.rb

@@ -1,11 +1,35 @@
 # Ruby Monthly calendar
 
-begin
-  d = Date.parse(ARGV.first)
-rescue
-  d = Date.today
-end
+module Mcalendar
+  class Command
+
+    def self.run(argv)
+      new(argv).execute
+    end
+
+    def initialize(argv)
+      @argv = argv
+    end
+
+    def execute
 
-calendar = Mcalendar::Calendar.new(d.year, d.month)
-calendar.display
-calendar.pdf
+      options = Mcalendar::Options.parse(@argv)
+      date = options[:date]
+      console = options[:opt][:console]
+      pdf = options[:opt][:pdf]
+      pdf_name = options[:opt][:name]
+      calendar = Mcalendar::Calendar.new(date.year, date.month, pdf_name)
+
+      # output calendar
+      calendar.display if console
+      calendar.pdf if pdf
+
+      # both outputs if no options
+      if console.nil? && pdf.nil?
+        calendar.display
+        calendar.pdf
+      end
+      
+    end
+  end
+end

data/lib/mcalendar/options.rb

@@ -0,0 +1,37 @@
+module Mcalendar
+  module Options
+
+    def self.parse(argv)
+      options = {}
+
+      parser = OptionParser.new do |o|
+        o.on_head('-v', '--version', 'Show version') do
+          o.version = Mcalendar::VERSION
+          puts o.version
+        end
+        o.on('-p', '--pdf', 'output pdf') {|v| options[:pdf] = v}
+        o.on('-n NAME', '--name=NAME', String, 'output pdf name') {|v| options[:name] = v}
+        o.on('-c', '--console', 'output console') {|v| options[:console] = v}
+      end
+
+      begin
+        remained = parser.parse!(argv)
+      rescue OptionParser::InvalidArgument => e
+        abort e.message
+      rescue OptionParser::MissingArgument => e
+        case e.args
+        when ["-n"], ["--name"]
+          options[:name] = Mcalendar::DEFAULT_PDF_NAME
+        end
+      end
+      
+      begin
+        d = Date.parse(remained.first)
+      rescue
+        d = Date.today
+      end
+
+      {date: d, opt: options}
+    end
+  end
+end

data/lib/mcalendar/version.rb

@@ -1,3 +1,3 @@
 module Mcalendar
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/mcalendar.rb

@@ -1,7 +1,9 @@
 require 'date'
 require "prawn"
 require "prawn/table"
+require "optparse"
 
 require_relative 'mcalendar/calendar'
 require_relative 'mcalendar/command'
-require_relative 'mcalendar/version'
+require_relative 'mcalendar/options'
+require_relative 'mcalendar/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcalendar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - icm7216
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -86,6 +86,7 @@ files:
 - lib/mcalendar.rb
 - lib/mcalendar/calendar.rb
 - lib/mcalendar/command.rb
+- lib/mcalendar/options.rb
 - lib/mcalendar/version.rb
 - mcalendar.gemspec
 homepage: https://github.com/icm7216/mcalendar