Hokkaido 0.0.3 → 0.0.4

data/chronic/test/test_repeater_week.rb

@@ -0,0 +1,62 @@
+require 'helper'
+
+class TestRepeaterWeek < TestCase
+
+  def setup
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_next_future
+    weeks = Chronic::RepeaterWeek.new(:week)
+    weeks.start = @now
+
+    next_week = weeks.next(:future)
+    assert_equal Time.local(2006, 8, 20), next_week.begin
+    assert_equal Time.local(2006, 8, 27), next_week.end
+
+    next_next_week = weeks.next(:future)
+    assert_equal Time.local(2006, 8, 27), next_next_week.begin
+    assert_equal Time.local(2006, 9, 3), next_next_week.end
+  end
+
+  def test_next_past
+    weeks = Chronic::RepeaterWeek.new(:week)
+    weeks.start = @now
+
+    last_week = weeks.next(:past)
+    assert_equal Time.local(2006, 8, 6), last_week.begin
+    assert_equal Time.local(2006, 8, 13), last_week.end
+
+    last_last_week = weeks.next(:past)
+    assert_equal Time.local(2006, 7, 30), last_last_week.begin
+    assert_equal Time.local(2006, 8, 6), last_last_week.end
+  end
+
+  def test_this_future
+    weeks = Chronic::RepeaterWeek.new(:week)
+    weeks.start = @now
+
+    this_week = weeks.this(:future)
+    assert_equal Time.local(2006, 8, 16, 15), this_week.begin
+    assert_equal Time.local(2006, 8, 20), this_week.end
+  end
+
+  def test_this_past
+    weeks = Chronic::RepeaterWeek.new(:week)
+    weeks.start = @now
+
+    this_week = weeks.this(:past)
+    assert_equal Time.local(2006, 8, 13, 0), this_week.begin
+    assert_equal Time.local(2006, 8, 16, 14), this_week.end
+  end
+
+  def test_offset
+    span = Chronic::Span.new(@now, @now + 1)
+
+    offset_span = Chronic::RepeaterWeek.new(:week).offset(span, 3, :future)
+
+    assert_equal Time.local(2006, 9, 6, 14), offset_span.begin
+    assert_equal Time.local(2006, 9, 6, 14, 0, 1), offset_span.end
+  end
+
+end

data/chronic/test/test_repeater_weekday.rb

@@ -0,0 +1,55 @@
+require 'helper'
+
+class TestRepeaterWeekday < TestCase
+
+  def setup
+    @now = Time.local(2007, 6, 11, 14, 0, 0, 0) # Mon
+  end
+
+  def test_next_future
+    weekdays = Chronic::RepeaterWeekday.new(:weekday)
+    weekdays.start = @now
+
+    next1_weekday = weekdays.next(:future) # Tues
+    assert_equal Time.local(2007, 6, 12), next1_weekday.begin
+    assert_equal Time.local(2007, 6, 13), next1_weekday.end
+
+    next2_weekday = weekdays.next(:future) # Wed
+    assert_equal Time.local(2007, 6, 13), next2_weekday.begin
+    assert_equal Time.local(2007, 6, 14), next2_weekday.end
+
+    next3_weekday = weekdays.next(:future) # Thurs
+    assert_equal Time.local(2007, 6, 14), next3_weekday.begin
+    assert_equal Time.local(2007, 6, 15), next3_weekday.end
+
+    next4_weekday = weekdays.next(:future) # Fri
+    assert_equal Time.local(2007, 6, 15), next4_weekday.begin
+    assert_equal Time.local(2007, 6, 16), next4_weekday.end
+
+    next5_weekday = weekdays.next(:future) # Mon
+    assert_equal Time.local(2007, 6, 18), next5_weekday.begin
+    assert_equal Time.local(2007, 6, 19), next5_weekday.end
+  end
+
+  def test_next_past
+    weekdays = Chronic::RepeaterWeekday.new(:weekday)
+    weekdays.start = @now
+
+    last1_weekday = weekdays.next(:past) # Fri
+    assert_equal Time.local(2007, 6, 8), last1_weekday.begin
+    assert_equal Time.local(2007, 6, 9), last1_weekday.end
+
+    last2_weekday = weekdays.next(:past) # Thurs
+    assert_equal Time.local(2007, 6, 7), last2_weekday.begin
+    assert_equal Time.local(2007, 6, 8), last2_weekday.end
+  end
+
+  def test_offset
+    span = Chronic::Span.new(@now, @now + 1)
+
+    offset_span = Chronic::RepeaterWeekday.new(:weekday).offset(span, 5, :future)
+
+    assert_equal Time.local(2007, 6, 18, 14), offset_span.begin
+    assert_equal Time.local(2007, 6, 18, 14, 0, 1), offset_span.end
+  end
+end

data/chronic/test/test_repeater_weekend.rb

@@ -0,0 +1,74 @@
+require 'helper'
+
+class TestRepeaterWeekend < TestCase
+
+  def setup
+    # Wed Aug 16 14:00:00 2006
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_next_future
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+
+    next_weekend = weekend.next(:future)
+    assert_equal Time.local(2006, 8, 19), next_weekend.begin
+    assert_equal Time.local(2006, 8, 21), next_weekend.end
+  end
+
+  def test_next_past
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+
+    next_weekend = weekend.next(:past)
+    assert_equal Time.local(2006, 8, 12), next_weekend.begin
+    assert_equal Time.local(2006, 8, 14), next_weekend.end
+  end
+
+  def test_this_future
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+
+    next_weekend = weekend.this(:future)
+    assert_equal Time.local(2006, 8, 19), next_weekend.begin
+    assert_equal Time.local(2006, 8, 21), next_weekend.end
+  end
+
+  def test_this_past
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+
+    next_weekend = weekend.this(:past)
+    assert_equal Time.local(2006, 8, 12), next_weekend.begin
+    assert_equal Time.local(2006, 8, 14), next_weekend.end
+  end
+
+  def test_this_none
+    weekend = Chronic::RepeaterWeekend.new(:weekend)
+    weekend.start = @now
+
+    next_weekend = weekend.this(:future)
+    assert_equal Time.local(2006, 8, 19), next_weekend.begin
+    assert_equal Time.local(2006, 8, 21), next_weekend.end
+  end
+
+  def test_offset
+    span = Chronic::Span.new(@now, @now + 1)
+
+    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 3, :future)
+
+    assert_equal Time.local(2006, 9, 2), offset_span.begin
+    assert_equal Time.local(2006, 9, 2, 0, 0, 1), offset_span.end
+
+    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 1, :past)
+
+    assert_equal Time.local(2006, 8, 12), offset_span.begin
+    assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
+
+    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 0, :future)
+
+    assert_equal Time.local(2006, 8, 12), offset_span.begin
+    assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
+  end
+
+end

data/chronic/test/test_repeater_year.rb

@@ -0,0 +1,69 @@
+require 'helper'
+
+class TestRepeaterYear < TestCase
+
+  def setup
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_next_future
+    years = Chronic::RepeaterYear.new(:year)
+    years.start = @now
+
+    next_year = years.next(:future)
+    assert_equal Time.local(2007, 1, 1), next_year.begin
+    assert_equal Time.local(2008, 1, 1), next_year.end
+
+    next_next_year = years.next(:future)
+    assert_equal Time.local(2008, 1, 1), next_next_year.begin
+    assert_equal Time.local(2009, 1, 1), next_next_year.end
+  end
+
+  def test_next_past
+    years = Chronic::RepeaterYear.new(:year)
+    years.start = @now
+
+    last_year = years.next(:past)
+    assert_equal Time.local(2005, 1, 1), last_year.begin
+    assert_equal Time.local(2006, 1, 1), last_year.end
+
+    last_last_year = years.next(:past)
+    assert_equal Time.local(2004, 1, 1), last_last_year.begin
+    assert_equal Time.local(2005, 1, 1), last_last_year.end
+  end
+
+  def test_this
+    years = Chronic::RepeaterYear.new(:year)
+    years.start = @now
+
+    this_year = years.this(:future)
+    assert_equal Time.local(2006, 8, 17), this_year.begin
+    assert_equal Time.local(2007, 1, 1), this_year.end
+
+    this_year = years.this(:past)
+    assert_equal Time.local(2006, 1, 1), this_year.begin
+    assert_equal Time.local(2006, 8, 16), this_year.end
+  end
+
+  def test_offset
+    span = Chronic::Span.new(@now, @now + 1)
+
+    offset_span = Chronic::RepeaterYear.new(:year).offset(span, 3, :future)
+
+    assert_equal Time.local(2009, 8, 16, 14), offset_span.begin
+    assert_equal Time.local(2009, 8, 16, 14, 0, 1), offset_span.end
+
+    offset_span = Chronic::RepeaterYear.new(:year).offset(span, 10, :past)
+
+    assert_equal Time.local(1996, 8, 16, 14), offset_span.begin
+    assert_equal Time.local(1996, 8, 16, 14, 0, 1), offset_span.end
+
+    now = Time.local(2008, 2, 29)
+    span = Chronic::Span.new(now, now + 1)
+    offset_span = Chronic::RepeaterYear.new(:year).offset(span, 1, :past)
+
+    assert_equal Time.local(2007, 2, 28), offset_span.begin
+    assert_equal Time.local(2007, 2, 28, 0, 0, 1), offset_span.end
+  end
+
+end

data/chronic/test/test_span.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+class TestSpan < TestCase
+
+  def setup
+    # Wed Aug 16 14:00:00 UTC 2006
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_span_width
+    span = Chronic::Span.new(Time.local(2006, 8, 16, 0), Time.local(2006, 8, 17, 0))
+    assert_equal (60 * 60 * 24), span.width
+  end
+
+  def test_span_math
+    s = Chronic::Span.new(1, 2)
+    assert_equal 2, (s + 1).begin
+    assert_equal 3, (s + 1).end
+    assert_equal 0, (s - 1).begin
+    assert_equal 1, (s - 1).end
+  end
+
+end

data/chronic/test/test_token.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class TestToken < TestCase
+
+  def setup
+    # Wed Aug 16 14:00:00 UTC 2006
+    @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
+  end
+
+  def test_token
+    token = Chronic::Token.new('foo')
+    assert_equal 0, token.tags.size
+    assert !token.tagged?
+    token.tag("mytag")
+    assert_equal 1, token.tags.size
+    assert token.tagged?
+    assert_equal String, token.get_tag(String).class
+    token.tag(5)
+    assert_equal 2, token.tags.size
+    token.untag(String)
+    assert_equal 1, token.tags.size
+    assert_equal 'foo', token.word
+  end
+
+end

data/lib/Hokkaido/version.rb

@@ -1,3 +1,3 @@
 module Hokkaido
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/Hokkaido.rb

@@ -1,21 +1,22 @@
 require "Hokkaido/version"
 require 'gem_modifier'
-require 'term/ansicolor'
+#require 'term/ansicolor'
 
 module Hokkaido
 
-  RUBYMOTION_GEM_CONFIG = <<-HEREDOC
-  Motion::Project::App.setup do |app|
-    MAIN_CONFIG_FILES
-  end
-  HEREDOC
+RUBYMOTION_GEM_CONFIG = <<-HEREDOC
+Motion::Project::App.setup do |app|
+MAIN_CONFIG_FILES
+end
+HEREDOC
 
-  INCLUDE_STRING = "    app.files << File.expand_path(File.join(File.dirname(__FILE__),'RELATIVE_LIBRARY_PATH'))"
+  INCLUDE_STRING = "  app.files << File.expand_path(File.join(File.dirname(__FILE__),'RELATIVE_LIBRARY_PATH'))"
 
   class Port
 
     def initialize(info, options=nil)
       @mod_gem = GemModifier.new(info)
+      @true_path = File.join(@mod_gem.lib_folder, @mod_gem.init_lib)
     end
 
     def modify
@@ -23,9 +24,12 @@ module Hokkaido
     end
 
     def test
-      true_path = File.join(@mod_gem.lib_folder, @mod_gem.init_lib)
       mocklib = File.expand_path('lib/motion_mock.rb')
-      system("/usr/bin/env ruby -r #{mocklib} #{true_path}")
+      system("/usr/bin/env ruby -r #{mocklib} #{@true_path}")
+    end
+
+    def produced_eval_fixme
+      File.read(@true_path).include?("FIXME: #eval")
     end
   end
 

data/lib/gem_modifier.rb

@@ -4,6 +4,23 @@ require 'tempfile'
 
 # require removal only
 
+class File
+  def self.prepend(path, string)
+    Tempfile.open File.basename(path) do |tempfile|
+      # shift string to tempfile
+      tempfile << string
+
+      File.open(path, 'r+') do |file|
+        # append original data to tempfile
+        tempfile << file.read
+        # reset file positions
+        file.pos = tempfile.pos = 0
+        # copy tempfile back to original file
+        file << tempfile.read
+      end
+    end
+  end
+end
 
 
 module Hokkaido
@@ -65,6 +82,11 @@ module Hokkaido
           # comment it out
           current_file += "# #{line}"
           next
+        elsif line.strip =~ /^eval/
+          # comment it out
+          current_file += "# FIXME: #eval is not available in motion\n"
+          current_file += "# #{line}"
+          next
         end
 
         # dont intefere
@@ -91,9 +113,7 @@ module Hokkaido
       # creates config manifest
       @manifest = RUBYMOTION_GEM_CONFIG.gsub("MAIN_CONFIG_FILES", @manifest_files.join("\n"))
 
-      # puts @manifest
-
-      File.open(File.join(@lib_folder, @init_lib), 'a') {|f| f.puts(@manifest) } #unless TEST_MODE
+      File.prepend(File.join(@lib_folder, @init_lib), @manifest)
 
     end
 

data/lib/term/ansicolor.rb

@@ -1,3 +1,6 @@
+Motion::Project::App.setup do |app|
+  app.files << File.expand_path(File.join(File.dirname(__FILE__),'ansicolor.rb'))
+end
 module Hokkaido
   module Term
     # The ANSIColor module can be used for namespacing and mixed into your own
@@ -53,7 +56,7 @@ module Hokkaido
       self.coloring = true
 
       ATTRIBUTES.each do |c, v|
-        eval %Q{
+# Module#eval is disabled in motion#         eval %Q{
             def #{c}(string = nil)
               result = ''
               result << "\e[#{v}m" if Hokkaido::Term::ANSIColor.coloring?

data/spec/Hokkaido/port_spec.rb

@@ -1,19 +1,27 @@
 require 'spec_helper'
 
 describe Hokkaido::Port do
-  before do
-    File.directory?("gherkin").should be_true
-    FileUtils.cp_r "gherkin", "gherkin-spec"
-    @info = ["gherkin-spec", "gherkin.rb", "gherkin-spec/lib"]
-  end
+
   
   it "should pass self test" do
+    File.directory?("chronic").should be_true
+    FileUtils.cp_r "chronic", "chronic-spec"
+    @info = ["chronic-spec", "chronic.rb", "chronic-spec/lib"]
     port = Hokkaido::Port.new(@info)
     port.modify
     port.test.should be_true
+    FileUtils.rmtree 'chronic-spec'
   end
 
-  after do
-    FileUtils.rmtree 'gherkin-spec'
+  it "should produce a FIXME when eval is used" do
+    File.directory?("ansiterm-color").should be_true
+    FileUtils.cp_r "ansiterm-color", "ansiterm-spec"
+    @info = ["ansiterm-spec", "ansicolor.rb", "ansiterm-spec/lib/term"]
+    port = Hokkaido::Port.new(@info)
+    port.modify
+    port.produced_eval_fixme.should be_true
+    FileUtils.rmtree 'ansiterm-spec'
   end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Hokkaido
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -143,7 +143,83 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ansiterm-color/.gitignore
+- ansiterm-color/CHANGES
+- ansiterm-color/COPYING
+- ansiterm-color/README
+- ansiterm-color/Rakefile
+- ansiterm-color/VERSION
+- ansiterm-color/bin/cdiff
+- ansiterm-color/bin/decolor
+- ansiterm-color/doc-main.txt
+- ansiterm-color/examples/example.rb
+- ansiterm-color/install.rb
+- ansiterm-color/lib/term/ansicolor.rb
+- ansiterm-color/lib/term/ansicolor/.keep
+- ansiterm-color/lib/term/ansicolor/version.rb
+- ansiterm-color/make_doc.rb
+- ansiterm-color/tests/ansicolor_test.rb
 - bin/Hokkaido
+- chronic/.gitignore
+- chronic/HISTORY.md
+- chronic/LICENSE
+- chronic/README.md
+- chronic/Rakefile
+- chronic/chronic.gemspec
+- chronic/lib/chronic.rb
+- chronic/lib/chronic/grabber.rb
+- chronic/lib/chronic/handler.rb
+- chronic/lib/chronic/handlers.rb
+- chronic/lib/chronic/mini_date.rb
+- chronic/lib/chronic/numerizer.rb
+- chronic/lib/chronic/ordinal.rb
+- chronic/lib/chronic/pointer.rb
+- chronic/lib/chronic/repeater.rb
+- chronic/lib/chronic/repeaters/repeater_day.rb
+- chronic/lib/chronic/repeaters/repeater_day_name.rb
+- chronic/lib/chronic/repeaters/repeater_day_portion.rb
+- chronic/lib/chronic/repeaters/repeater_fortnight.rb
+- chronic/lib/chronic/repeaters/repeater_hour.rb
+- chronic/lib/chronic/repeaters/repeater_minute.rb
+- chronic/lib/chronic/repeaters/repeater_month.rb
+- chronic/lib/chronic/repeaters/repeater_month_name.rb
+- chronic/lib/chronic/repeaters/repeater_season.rb
+- chronic/lib/chronic/repeaters/repeater_season_name.rb
+- chronic/lib/chronic/repeaters/repeater_second.rb
+- chronic/lib/chronic/repeaters/repeater_time.rb
+- chronic/lib/chronic/repeaters/repeater_week.rb
+- chronic/lib/chronic/repeaters/repeater_weekday.rb
+- chronic/lib/chronic/repeaters/repeater_weekend.rb
+- chronic/lib/chronic/repeaters/repeater_year.rb
+- chronic/lib/chronic/scalar.rb
+- chronic/lib/chronic/season.rb
+- chronic/lib/chronic/separator.rb
+- chronic/lib/chronic/span.rb
+- chronic/lib/chronic/tag.rb
+- chronic/lib/chronic/time_zone.rb
+- chronic/lib/chronic/token.rb
+- chronic/test/helper.rb
+- chronic/test/test_chronic.rb
+- chronic/test/test_daylight_savings.rb
+- chronic/test/test_handler.rb
+- chronic/test/test_mini_date.rb
+- chronic/test/test_numerizer.rb
+- chronic/test/test_parsing.rb
+- chronic/test/test_repeater_day_name.rb
+- chronic/test/test_repeater_day_portion.rb
+- chronic/test/test_repeater_fortnight.rb
+- chronic/test/test_repeater_hour.rb
+- chronic/test/test_repeater_minute.rb
+- chronic/test/test_repeater_month.rb
+- chronic/test/test_repeater_month_name.rb
+- chronic/test/test_repeater_season.rb
+- chronic/test/test_repeater_time.rb
+- chronic/test/test_repeater_week.rb
+- chronic/test/test_repeater_weekday.rb
+- chronic/test/test_repeater_weekend.rb
+- chronic/test/test_repeater_year.rb
+- chronic/test/test_span.rb
+- chronic/test/test_token.rb
 - lib/Hokkaido.rb
 - lib/Hokkaido/version.rb
 - lib/gem_modifier.rb