cleansweep 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f772f74727a7d58fdebda097fb0b70572cb92c34
-  data.tar.gz: a82986ae0e26308e4842193441e427e998c4f5a0
+  metadata.gz: 5af728c3efc79bc3cec89d0ee6d3d109b5ba4481
+  data.tar.gz: 53d6d9bcdc7c4d9532931bd144274624e824df22
 SHA512:
-  metadata.gz: 183922164f35fbd986ca9617fa1c73fc4133db90fc15a59552f48def16a8d39d8a8164bbef8d61ee334f6a8dffbfc74a34f5fbb182d446d7485372b6add8667a
-  data.tar.gz: 77e4f14d2e44e7400d4bb14a09719fea8a13aac2660fab0712355b053d8117e848f7dd967878b01ec5c87c6181eca821056f4e388b00c93cd4b005432d1c0ebc
+  metadata.gz: 370455a298b5a0a5fada8b5521e7ccb8fcdc12aada97761a65ffd8f54a33538c7bbaaf9356a644f6b5c95f610b55c6bbfb0a7a16a728604c23289ff46ce840f9
+  data.tar.gz: ac7b4a332aa6c8aa375ab759ebe51cd28c907cd8b41a6b17f777cd228c9830883e61039685ac59ee5bf716b5f98221d29d3812804413b293acc2575dab06ed65

data/CHANGES.md

@@ -1,5 +1,9 @@
 See the [documentation](http://bkayser.github.io/cleansweep) for details
 
+### Version 1.0.5
+
+* Fix timestamp in interval reports which was off by timezone offset in hours.
+
 ### Version 1.0.4
 
 * Print dry run output using the logger

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cleansweep (1.0.4)
+    cleansweep (1.0.5)
       activerecord (>= 3.0)
       mysql2 (~> 0.3)
       newrelic_rpm

data/README.md

@@ -2,9 +2,10 @@ Cleansweep is a utility for scripting purges using ruby in an
 efficient, low-impact manner on mysql innodb tables.  Based on the
 Percona `pt-archive` utility.
 
-[![Build Status](https://img.shields.io/travis/bkayser/cleansweep/master.svg?x=3)](https://travis-ci.org/bkayser/cleansweep)
-[![Code Climate](https://codeclimate.com/github/bkayser/cleansweep/badges/gpa.svg?x=3)](https://codeclimate.com/github/bkayser/cleansweep)
-[![Test Coverage](https://codeclimate.com/github/bkayser/cleansweep/badges/coverage.svg?x=3)](https://codeclimate.com/github/bkayser/cleansweep)
+[![Build Status](https://img.shields.io/travis/bkayser/cleansweep/master.svg?x=4)](https://travis-ci.org/bkayser/cleansweep)
+[![Code Climate](https://codeclimate.com/github/bkayser/cleansweep/badges/gpa.svg?x=4)](https://codeclimate.com/github/bkayser/cleansweep)
+[![Test Coverage](https://codeclimate.com/github/bkayser/cleansweep/badges/coverage.svg?x=4)](https://codeclimate.com/github/bkayser/cleansweep)
+[![Gem Version](https://badge.fury.io/rb/cleansweep.svg)](http://badge.fury.io/rb/cleansweep)
 
 ## Installation
 
@@ -139,7 +140,7 @@ week are copied.
                                            index: 'comments_on_account_timestamp',
                                            dest_model: ExpiredComment,
                                            copy_only: true,
-                                           copy_columns: %w[liked] do do | model |
+                                           copy_columns: %w[liked] do | model |
         model.where('last_used_at < ?', 1.week.ago)
       end
 ```

data/lib/clean_sweep/purge_runner.rb

@@ -123,8 +123,9 @@ class CleanSweep::PurgeRunner
     raise "An index is required in copy mode" if copy_mode? && @table_schema.traversing_key.nil?
     raise "first_only option not allowed in copy mode" if copy_mode? && @table_schema.first_only?
 
-    @report_interval_start = Time.now
-
+    @start                 = Time.now
+    @report_interval_start = @start
+    @total_deleted         = 0
     @query                 = @table_schema.initial_scope.limit(@limit)
 
     @query = yield(@query) if block_given?
@@ -148,7 +149,6 @@ class CleanSweep::PurgeRunner
       return 0
     end
 
-    @start = Time.now
     verb = copy_mode? ? "copying" : "purging"
 
     msg = "starting: #{verb} #{@table_schema.name} records in batches of #@limit"
@@ -156,7 +156,6 @@ class CleanSweep::PurgeRunner
 
 
     log :info,  "sleeping #{@sleep} seconds between purging" if @sleep && !copy_mode?
-    @total_deleted = 0
 
     # Iterate through the rows in limit chunks
     log :debug, "find rows: #{@query.to_sql}" if @logger.level == Logger::DEBUG

data/lib/clean_sweep/purge_runner/logging.rb

@@ -3,7 +3,7 @@ module CleanSweep::PurgeRunner::Logging
   def report(force=false)
     report_duration = Time.now - @report_interval_start
     if (force || report_duration >= @report_interval)
-      while (@report_interval_start < Time.now - @report_interval) do
+      while (@report_interval > 0 && @report_interval_start < Time.now - @report_interval) do
         @report_interval_start += @report_interval
       end
       print_report
@@ -49,7 +49,7 @@ module CleanSweep::PurgeRunner::Logging
     if (time.to_i > (24 * 60 * 60))
       format_string = "%d days, %H:%M"
     end
-    Time.at(time).strftime(format_string)
+    Time.at(time).utc.strftime(format_string)
   end
 
   def print_report

data/lib/clean_sweep/version.rb

@@ -1,3 +1,3 @@
 module CleanSweep
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/purge_runner_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
-
-# Time mocking features are available in Rails 4 but not Rails 3 and the Timecop 
-# gem works with both.
-require 'timecop'
+require 'logger'
 
 describe CleanSweep::PurgeRunner do
 
@@ -165,6 +162,40 @@ EOF
         expect(Book.count).to be 0
       end
 
+      context "logging" do
+        before do
+          @buffer = StringIO.new
+          logger = Logger.new(@buffer)
+          logger.formatter = SimpleFormatter.new
+          @purger = CleanSweep::PurgeRunner.new model: Book,
+                                               chunk_size: 4,
+                                               logger: logger,
+                                               report: 5.minutes
+
+        end
+
+        it 'should log correct timestamps' do
+          Timecop.freeze 90.seconds.from_now
+          @purger.report(true)
+          expect(@buffer.string).to eq <<EOF
+ ** report:
+ **   deleted:            0 books records
+ **   elapsed:     00:01:30
+ **   rate:             < 1 records/second
+EOF
+        end
+
+        it 'should log at correct intervals' do
+          Timecop.freeze 4.minutes.from_now
+          @purger.report
+          expect(@buffer.string).to eq ""
+
+          Timecop.freeze 6.minutes.from_now
+          @purger.report
+          expect(@buffer.string).to_not be_empty
+        end
+      end
+
       it 'copies books' do
         BookTemp.create_table
         purger = CleanSweep::PurgeRunner.new model: Book,
@@ -225,6 +256,12 @@ describe CleanSweep::PurgeRunner::MysqlStatus do
     end
   end
 
+  class SimpleFormatter < ::Logger::Formatter
+    def call(severity, timestamp, progname, msg)
+      "#{msg}\n"
+    end
+  end
+
 end
 
 

data/spec/spec_helper.rb

@@ -7,7 +7,11 @@ require 'factory_girl'
 require 'fileutils'
 require 'active_record'
 require 'mysql2'
+
+# Time mocking features are available in Rails 4 but not Rails 3 and the Timecop 
+# gem works with both.
 require 'timecop'
+
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.formatter = :progress

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cleansweep
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Bill Kayser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord