thin_out_backups 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d6be8da9f0658e2676938578b1ddd41b75a7f4
-  data.tar.gz: 5a2984aa1a4a421162f54ce5d7ada3a5577baad9
+  metadata.gz: 661c20167ace8b36008890eaee10ac93d662c591
+  data.tar.gz: f85c7b2d8155cb91edff3795baec40438ff80cb0
 SHA512:
-  metadata.gz: af12c88ead979aa39ce41ec69baef553a9188ea37d5098cb05d3fe68ac46ad763036da32acc08c92a950c50de553fc0d192ff1ad90920aa07899c852b79d533f
-  data.tar.gz: 4f2a39d8e4a1d4e4ee2d9c77e6b0ce6cd68c03d67b1d51004cb20012d97d368f0ef7c3707cd48085c46b42343f198309d369c608c581eda2a54345af810f6935
+  metadata.gz: 6f8867b4f850c67601ab97ac1819b1491743a51b5e6186cecd1d2d9fcc615c46b0ca4efdb06c74b65c19e721c48155710f2a7c89334941f0e315746706a6dfc8
+  data.tar.gz: df07738545e69a9203ec2d7254af5bfa4f8876f4c7c81df180f3c690d5c514661500aad7ac24ab64f218b9c1f4a7fd560b7bc01a5b1574ba869e2331dc3f57d7

data/lib/thin_out_backups/version.rb

@@ -1,3 +1,3 @@
 module ThinOutBackups
-  Version = "0.0.2"
+  Version = "0.0.3"
 end

data/lib/thin_out_backups.rb

@@ -8,9 +8,11 @@ require 'delegate'
 
 #require 'rubygems'
 require 'facets/time'
+require 'facets/time/hence'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/date/calculations'
 require 'colored'
 require 'quality_extensions/module/attribute_accessors'
-require 'thin_out_backups/time_fixes'
 
 class ThinOutBackups::Command
   #---------------------------------------------------------------------------------------------------------------------------------------------------
@@ -81,7 +83,7 @@ class ThinOutBackups::Command
     def start_time
       start_time = parent.now.dup
       if parent.align_at_beginning_of_time_interval
-        beginning_of_interval = 
+        beginning_of_interval =
           case unit
           when :minutes
             start_time.change(:sec => 0)
@@ -90,7 +92,7 @@ class ThinOutBackups::Command
           when :days
             start_time.change(:hour => 0)
           when :weeks
-            start_time.beginning_of_week
+            start_time.beginning_of_week(:sunday)
           when :months
             start_time.change(             :day => 1, :hour => 0)
           when :years

data/spec/thin_out_backups_spec.rb

@@ -13,9 +13,9 @@ describe '.time_format' do
   it { 'db_backup.2016-04-28T01:04.sql.gz'.should match subject }
 end
 
-describe Time, "#beginning_of_week" do
+describe Time, "#beginning_of_week(:sunday)" do
   it "should return a Sunday" do
-    Time.utc(2008,11,12).beginning_of_week.should == Time.utc(2008,11,9)
+    Time.utc(2008,11,12).beginning_of_week(:sunday).should == Time.utc(2008,11,9)
   end
 end
 
@@ -56,7 +56,7 @@ end
 
 $command = <<End
 thin_out_backups --force --daily=3 --weekly=3 --monthly=* \
-                --now='#{$now.to_s_full}'\
+                --now='#{$now.strftime("%Y-%m-%d %H:%M:%S")}'\
                 spec/test_dir/db_dumps \
                 spec/test_dir/maildir
 End

data/thin_out_backups.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'facets'
   gem.add_dependency 'colored'
   gem.add_dependency 'quality_extensions'
+  gem.add_dependency 'activesupport'
 
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_out_backups
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tyler Rick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +97,6 @@ files:
 - Readme.md
 - bin/thin_out_backups
 - lib/thin_out_backups.rb
-- lib/thin_out_backups/time_fixes.rb
 - lib/thin_out_backups/version.rb
 - spec/thin_out_backups_spec.rb
 - thin_out_backups.gemspec

data/lib/thin_out_backups/time_fixes.rb

@@ -1,131 +0,0 @@
-# Until facets gets patched proper, we'll monkey patch it here:
-# TODO: Is this still needed?
-#require '/home/tyler/dev/ruby/facets/lib/core/facets/time/hence'
-class Time
-
-  if defined?(::ActiveSupport)
-
-    alias_method :in, :since
-    alias_method :hence, :since
-
-  else
-
-    # Returns a new Time representing the time
-    # a number of time-units ago.
-    #
-    def ago(number, units=:seconds)
-      time =(
-        case units.to_s.downcase.to_sym
-        when :years
-          set(:year => (year - number))
-        when :months
-          y = ((month - number) / 12).to_i
-          #puts "(#{month} - #{number}) / 12 == #{y}"
-
-          new_month = ((month - number - 1) % 12) + 1
-          y += 1 if new_month > month
-          #puts y
-
-          set(:year => (year - y), :month => new_month)
-        when :weeks
-          self - (number * 604800)
-        when :days
-          self - (number * 86400)
-        when :hours
-          self - (number * 3600)
-        when :minutes
-          self - (number * 60)
-        when :seconds, nil
-          self - number
-        else
-          raise ArgumentError, "unrecognized time units -- #{units}"
-        end
-      )
-      dst_adjustment(time)
-    end
-    #
-    # Returns a new Time representing the time
-    # a number of time-units hence.
-
-    def hence(number, units=:seconds)
-      time =(
-        case units.to_s.downcase.to_sym
-        when :years
-          set( :year=>(year + number) )
-        when :months
-          y = ((month + number - 1) / 12).to_i
-          m = ((month + number - 1) % 12) + 1
-          set(:year => (year + y), :month => m)
-        when :weeks
-          self + (number * 604800)
-        when :days
-          self + (number * 86400)
-        when :hours
-          self + (number * 3600)
-        when :minutes
-          self + (number * 60)
-        when :seconds
-          self + number
-        else
-          raise ArgumentError, "unrecognized time units -- #{units}"
-        end
-      )
-      dst_adjustment(time)
-    end
-
-    alias_method :in, :hence
-    alias_method :since, :hence
-
-    # Adjust DST
-    #
-    # TODO: Can't seem to get this to pass ActiveSupport tests.
-    # Even though it is essentially identical to the
-    # ActiveSupport code (see Time#since in time/calculations.rb).
-    # It handles all but 4 tests.
-    def dst_adjustment(time)
-      self_dst = self.dst? ? 1 : 0
-      time_dst = time.dst? ? 1 : 0
-      seconds  = (self - time).abs
-      if (seconds >= 86400 && self_dst != time_dst)
-        time + ((self_dst - time_dst) * 60 * 60)
-      else
-        time
-      end
-    end
-
-  end
-
-end
-
-
-class DateTime
-  def to_time
-    Time.mktime(year, month, day, hour, min, sec)
-  end
-end
-
-class Time
-  def to_s
-    #strftime("%Y%m%dT%H%M%S")
-    strftime("%Y-%m-%d %H:%M")
-  end
-  def to_s_full
-    strftime("%Y-%m-%d %H:%M:%S")
-  end
-
-  # /usr/lib/ruby/gems/1.8/gems/activesupport-2.1.2/lib/active_support/core_ext/time/calculations.rb
-
-    def beginning_of_day
-      change(:hour => 0)
-    end
-    alias :midnight :beginning_of_day
-
-    # Returns a new Time representing the "start" of this week (Sunday, 0:00)
-    def beginning_of_week
-      days_to_sunday = self.wday
-      self.ago(days_to_sunday, :days).midnight
-    end
-    alias :sunday :beginning_of_week
-
-end
-