cog 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f8ad2d26be0b178e872bf2bb7f4b19e5500c35
-  data.tar.gz: 88a8343d3f76b4c2f26c44d77a2b643e760a5973
+  metadata.gz: 9392f9ee781234cef958cb8b7458004e8a2ab0fb
+  data.tar.gz: 4899e407f4b12b3b982fdbb9014eb0c6383f7b96
 SHA512:
-  metadata.gz: a20bef1a00a8a084a0fc3274f59ecd4a7e8cb9cceb58ea4a3a23f27533e508b03fb8449e541c95bea886339eefd5aba097dc82934946c93c1ea3509836d83e6c
-  data.tar.gz: 564cc0f972a33830b20223727e733456ba7fb4ec3ec4836faecbf77b0c8ae734b564f4c5718738b1beb7317ea24cb36bed9e43b7a786d2ef27d4569ca67b695b
+  metadata.gz: 482cc203a950afbbacb2c1d678e4c67ef4bd2d68fcea165bc54f466db1e3df0cd726fccb27cea665ad7acbc6f47bae22ff41a6004c8ae9f686cc671c6c7d7af9
+  data.tar.gz: f54a5fbf5482b805407560bcf4f6bf020f8289a869536cd8bb1113958fe43a9501f34e747e4a80b3a79c75e92064824f999323f603bc52d26889b3951ab0d3be

data/lib/cog/dsl/seed_dsl.rb

@@ -29,11 +29,6 @@ module Cog
         feature :destructor, &block
       end
       
-      # @api_developer
-      def respond_to?(meth)
-        meth.to_s.end_with?('_feature') || super(meth)
-      end
-      
       # @api developer
       def method_missing(meth, *args, &block)
         meth = meth.to_s
@@ -48,7 +43,7 @@ module Cog
           args << opt
           feature(*args, &block)
         else
-          super(meth, *args, &block)
+          super
         end
       end
       

data/lib/cog/helpers/file_scanner.rb

@@ -1,6 +1,6 @@
 class String
   def normalize_eol
-    gsub /(\r|\n|\r\n)/, "\n"
+    gsub(/\r\n/, "\n").gsub(/\r/, "\n")
   end
 end
 
@@ -18,14 +18,17 @@ module Cog
       def initialize(filename)
         @filename = filename
         @f = File.open filename, 'r'
+        @f = @f.binmode if @f.respond_to?(:binmode)
         @lines = []
         @mark = nil
         @cap_begin_pos = nil
         @cap_end_pos = nil
+        @cap_end_lineno = nil
         @match = nil # The last match object
         @win_fudge = if RUBY_PLATFORM =~ /(mswin|mingw)/
-          x = @f.readline.end_with? '\r\n'
+          x = @f.readline.end_with? "\r\n"
           @f.seek 0
+          @f.lineno = 0
           x ? 0 : 1
         else
           0
@@ -120,6 +123,7 @@ module Cog
           return true if line =~ pattern
           @lines << line
           @cap_end_pos = @f.pos # win_fudge not needed here
+          @cap_end_lineno = @f.lineno
         end
       rescue EOFError
         false
@@ -137,11 +141,13 @@ module Cog
       def replace_captured_text(value, opt={})
         return false if @cap_begin_pos.nil? || @cap_end_pos.nil?
         @f.seek 0
-        tmp.write @f.read(opt[:once] ? @mark : @cap_begin_pos).normalize_eol
-        tmp.write value.normalize_eol
+        @f.lineno = 0
+        tmp.write @f.read(opt[:once] ? @mark : @cap_begin_pos)
+        tmp.write value
         @f.seek @cap_end_pos
+        @f.lineno = @cap_end_lineno
         @f.readline if opt[:once]
-        tmp.write @f.read.normalize_eol
+        tmp.write @f.read
         tmp.close
         close
         FileUtils.mv tmp_filename, @filename
@@ -153,10 +159,11 @@ module Cog
       def insert_at_mark(value)
         return false if @mark.nil?
         @f.seek 0
-        tmp.write @f.read(@mark).normalize_eol
-        tmp.write value.normalize_eol
+        @f.lineno = 0
+        tmp.write @f.read(@mark)
+        tmp.write value
         @f.readline # discard original
-        tmp.write @f.read.normalize_eol
+        tmp.write @f.read
         tmp.close
         close
         FileUtils.mv tmp_filename, @filename
@@ -170,7 +177,11 @@ module Cog
       end
       
       def tmp
-        @tmp ||= File.open(tmp_filename, 'w')
+        unless @tmp
+          @tmp = File.open(tmp_filename, 'w')
+          @tmp = @tmp.binmode if @tmp.respond_to?(:binmode)
+        end
+        @tmp
       end
     end
     

data/lib/cog/version.rb

@@ -1,5 +1,5 @@
 module Cog
   unless const_defined? :VERSION
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cog
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Kevin Tonon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_support