ical_punch 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/bin/ical_punch

@@ -18,16 +18,8 @@ BANNER
   opts.separator ''
   opts.on('-v', '--version',
           "Show the #{File.basename($0)} version number and exit") { puts "#{File.basename($0)} #{Punch.verson}"; exit  }
-  # opts.on('--after [TIME]', String,
-  #         "Restrict command to only after the given time") { |time|  OPTIONS[:after] = Time.parse(time) }
-  # opts.on('--before [TIME]', String,
-  #         "Restrict command to only before the given time") { |time|  OPTIONS[:before] = Time.parse(time) }
-  # opts.on('--at [TIME]', '--time [TIME]', String,
-  #         "Use the given time to punch in/out") { |time|  OPTIONS[:time] = Time.parse(time) }
-  # opts.on('-m', '--message [MESSAGE]', String,
-  #         "Add the given log message when punching in/out") { |message|  OPTIONS[:message] = message }
   opts.on('-f', '--file [FILE_NAME]', String,
-            "File name of the you want to output to") {|message| OPTIONS[:file_name] = file_name}
+            "File name of the you want to output to") {|file_name| OPTIONS[:file_name] = file_name}
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -55,7 +47,22 @@ commands = {
     else
       IcalPunch.to_ical(project)
     end
+  end,
+  'from_ical' => lambda do |project|
+    if OPTIONS[:file_name] && OPTIONS[:file_name].size > 0
+      IcalPunch.load(OPTIONS[:file_name])
+      IcalPunch.from_ical(project)
+      IcalPunch.calendars_to_punch
+      IcalPunch.write(OPTIONS[:file_name])
+    else
+      IcalPunch.load
+      IcalPunch.from_ical(project)
+      IcalPunch.calendars_to_punch
+      IcalPunch.write()
+    end
   end
+
+
   # 'status' => lambda do |project|
   #   result = Punch.status(project)
   #   if project

data/ical_punch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ical_punch}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Kaufman"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-07-06}
   s.default_executable = %q{ical_punch}
   s.description = %q{ical_punch converts between iCalendar files and the punch.yml format}
   s.email = %q{rob@notch8.com}

data/lib/ical_punch.rb

@@ -86,9 +86,14 @@ module IcalPunch
     def calendars_to_punch
       @data = {}
       @calendars.each do |calendar|
-        key = calendar.prodid.split("/").last
+        key = calendar.events.first.summary
         @data[key] = calendar.events.collect do |event|
-          {"out" => event.dtend, "in" => event.dtstart, "total" => nil, "log" => event.description.to_s}
+          if event.description.nil?
+            description = ["punch in @ #{event.dtstart}", "punch out @ #{event.dtend}"]
+          else
+            description = event.description.split("\n")
+          end
+          {"out" => event.dtend, "in" => event.dtstart, "total" => nil, "log" => description}
         end
       end
       return @data
@@ -114,6 +119,7 @@ module IcalPunch
         @calendars = Icalendar.parse(file)
       end
     end
+    
   end
   
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Rob Kaufman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -07:00
+date: 2010-07-06 00:00:00 -07:00
 default_executable: ical_punch
 dependencies: 
 - !ruby/object:Gem::Dependency