snippr 0.15.4 → 0.15.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDg3ZWNjYmM5M2JlMTFmNDAyZDgwMzViZWZiNGQyMThhN2I2ODE1ZA==
+    NjA5MWRjNjE2MGU1OWQwY2ExZDViZDBjZjY4ZWU3MzZhNTJjYjU3YQ==
   data.tar.gz: !binary |-
-    YjUyZjM5ZjNjNjFiMDY2ZDQ1MmUwYTQzODU2ODg3Mjg3OTc1ZGUyMw==
+    MTdiNGRmZjg0ZDliZTQ0Y2UyYTQ3NzE1MGY2NTVmOGQyNDk5M2YyOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjUzOTEwMWM3NzdmZjI5NzM0ZDljOWMwOTMzMWMyZTNiNjg3ODhlODUxYWQ4
-    NTQ2MDJjNjMzZDJhMzdhMjVjZTY3NjU3MjkyZDdmNDQ2OTQyM2FjMjJlM2E1
-    N2ZmMWNkMTA4MTk5NmY4NjE5MDYxNjUyZDM4ZDE3ODY1YWE5MDk=
+    NzViMTdlZmJkODQ0MTRlYzQ5NjEwMGE0M2Q0YTBjMGJlNGE2NGJhNzZhNjNj
+    ZjcyMTgzZTBhYWFlNWYzYWI4ODc0MmY5M2NhMzgxNWRlNTdmNGI2ZmUyNDAy
+    N2ZiMzkyOTJjMWMzZDkyZWFhMDNlYTc4ZjViM2NiNjNkMzNhNjQ=
   data.tar.gz: !binary |-
-    NjA1NmEyN2YwYzNmZGVhYmYzMWM0YWMzZTljZmQwZDI0MTVmMDJiMjRkYmNl
-    MWVlMmNmZGJjNDhiOWExZmJiNzlhODg1OWY2NGMzMTVlNzFjNmVkNTdlODFi
-    ZmY5YWU1NGE1ZWQ3YzgxYzgyMThiZWVhNjEwNTM0ZmQ2ZjUwNWU=
+    MzM4MThjNzVmMjE3NmVlOTI0Y2VkM2EwZGFhM2Q3ZThmZGFhMzBiOWFhZGFi
+    MjdhYTQ3MjBmZTFmZWM4ZTJmNzJmYjQyMzQzYjM0YTZiNjY0MDEyYTg0Yjc4
+    OWQyOTk2NjVjMjYzODYyZTU3ZGJjMTk3YjllMzAwYmVkZjczZmQ=

data/README.md

@@ -148,6 +148,11 @@ Same as `valid_from` only the other way round
 Shows the snippet only in the given environment(s).  
 Separate environments with a comma (eg. production,test,unstable)
 
+#### on_host
+`on_host: thismachinehostname`:  
+Shows the snippet segment only on a host with the name 'thismachinehostname'.  
+Multiple hostnames can be given, separated with commas.
+
 ## I18n
 
 Snippr comes with support for I18n, but up until further notice, you have to manually enable this

data/lib/snippr.rb

@@ -11,11 +11,13 @@ require 'snippr/path'
 require 'snippr/processor'
 require 'snippr/railtie' if defined?(Rails)
 require 'snippr/view_helper'
+require 'snippr/clock'
 
 require 'snippr/segment_parser'
 require 'snippr/segment_filter/base'
 require 'snippr/segment_filter/valid_from'
 require 'snippr/segment_filter/valid_until'
+require 'snippr/segment_filter/on_host'
 require 'snippr/segment_filter/on_rails_env' if defined?(Rails)
 
 require 'snippr/normalizer/camelizer'

data/lib/snippr/clock.rb

@@ -0,0 +1,41 @@
+# -*- encoding : utf-8 -*-
+module Snippr
+  class Clock
+    def self.now
+      @interval_sec ||= 0
+      Time.now + @interval_sec
+    end
+
+    def self.interval=(interval="0s")
+      reset
+      @interval_sec = parse(interval)
+    end
+
+    def self.interval
+      @interval_sec
+    end
+
+    def self.reset
+      @interval_sec = 0
+      now
+    end
+
+    private
+
+    def self.parse(interval)
+      return 1 unless interval =~ /[+-][0-9]+[smhd]/
+
+      multiplicator = case interval[-1]
+                      when "m" then
+                        60
+                      when "h" then
+                        3600
+                      when "d" then
+                        86400
+                      else
+                        1
+                      end
+      @interval_sec = interval[0...-1].to_i*multiplicator
+    end
+  end
+end

data/lib/snippr/segment_filter/on_host.rb

@@ -0,0 +1,26 @@
+# -*- encoding : utf-8 -*-
+require "socket"
+
+module Snippr
+  module SegmentFilter
+    class OnHost < Base
+      def active?
+        if in_env?
+          true
+        else
+          false
+        end
+      end
+
+      private
+
+      def in_env?
+        sources.include?(Socket.gethostname)
+      end
+
+      def sources
+        @sources ||= @filter_value.split(",").map(&:strip)
+      end
+    end
+  end
+end

data/lib/snippr/segment_filter/valid_from.rb

@@ -3,7 +3,7 @@ module Snippr
   module SegmentFilter
     class ValidFrom < Base
       def active?
-        DateTime.now.to_s >= DateTime.strptime(@filter_value, "%Y-%m-%d %H:%M").to_s
+        Snippr::Clock.now.to_s >= DateTime.strptime(@filter_value, "%Y-%m-%d %H:%M").to_s
       rescue ArgumentError
         false
       end

data/lib/snippr/segment_filter/valid_until.rb

@@ -3,7 +3,7 @@ module Snippr
   module SegmentFilter
     class ValidUntil < Base
       def active?
-        DateTime.now.to_s <= DateTime.strptime(@filter_value, "%Y-%m-%d %H:%M").to_s
+        Snippr::Clock.now.to_s <= DateTime.strptime(@filter_value, "%Y-%m-%d %H:%M").to_s
       rescue ArgumentError
         false
       end

data/snippr.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "snippr"
-  s.version     = "0.15.4"
+  s.version     = "0.15.7"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann"]

data/spec/snippr/clock_spec.rb

@@ -0,0 +1,77 @@
+# -*- encoding : utf-8 -*-
+require "spec_helper"
+
+describe "Snippr::Clock" do
+
+  before do
+    Snippr::Clock.reset
+  end
+
+  describe ".now" do
+    # use TimeCop here
+    it "returns a time object" do
+      Snippr::Clock.now.should be_a(Time)
+    end
+
+    it "returns the current time if no interval is given" do
+      Snippr::Clock.now.to_i.should == Time.now.to_i
+    end
+
+    it "returns the modified time if an interval is set" do
+      Snippr::Clock.interval="+1d"
+      Snippr::Clock.now.to_i.should == (Time.now + 86400).to_i
+    end
+
+  end
+
+  describe ".reset" do
+    it "resets the time" do
+      Snippr::Clock.interval="+1d"
+      Snippr::Clock.reset
+      Snippr::Clock.now.to_i.should == Time.now.to_i
+    end
+  end
+
+  describe ".interval=" do
+    it "sets the time forward" do
+      Snippr::Clock.interval="+1m"
+      Snippr::Clock.interval.should == +60
+    end
+
+    it "sets the time backward" do
+      Snippr::Clock.interval="-1m"
+      Snippr::Clock.interval.should == -60
+    end
+
+    it "accepts seconds as scale" do
+      Snippr::Clock.interval="+1s"
+      Snippr::Clock.interval.should == +1
+    end
+
+    it "accepts minutes as scale" do
+      Snippr::Clock.interval="+1m"
+      Snippr::Clock.interval.should == +60
+    end
+
+    it "accepts hours as scale" do
+      Snippr::Clock.interval="+1h"
+      Snippr::Clock.interval.should == +3600
+    end
+
+    it "accepts days as scale" do
+      Snippr::Clock.interval="+1d"
+      Snippr::Clock.interval.should == +86400
+    end
+
+    it "doesn't set the time if the interval is invalid" do
+      Snippr::Clock.interval="blubb"
+      Snippr::Clock.interval.should == 1
+    end
+  end
+
+  describe "interval" do
+    it "returns the interval in seconds" do
+      Snippr::Clock.interval.should == 0
+    end
+  end
+end

data/spec/snippr/segment_filter/base_spec.rb

@@ -3,6 +3,6 @@ require "spec_helper"
 
 describe "Snippr::SegmentFilter::Base" do
   it "remembers its subclasses" do
-    Snippr::SegmentFilter::Base.should have(3).filters
+    Snippr::SegmentFilter::Base.should have(4).filters
   end
 end

data/spec/snippr/segment_filter/on_host_spec.rb

@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+require "spec_helper"
+
+describe "Snippr::SegmentFilter::OnHoAst" do
+  before do
+    Socket.expects(:gethostname).returns("thishost")
+  end
+
+  it "is active on the given host" do
+    Snippr::SegmentFilter::OnHost.new("thishost").should be_active
+  end
+
+  it "inactive on other than the given host" do
+    Snippr::SegmentFilter::OnHost.new("thathost").should_not be_active
+  end
+
+  it "allows multiple hostnames to be given" do
+    Snippr::SegmentFilter::OnHost.new("ahost, , thishost,     foobarhost").should be_active
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.7
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -121,12 +121,12 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/snippr.rb
+- lib/snippr/clock.rb
 - lib/snippr/i18n.rb
 - lib/snippr/links.rb
 - lib/snippr/meta_data.rb
@@ -142,6 +142,7 @@ files:
 - lib/snippr/processor/wikilinks.rb
 - lib/snippr/railtie.rb
 - lib/snippr/segment_filter/base.rb
+- lib/snippr/segment_filter/on_host.rb
 - lib/snippr/segment_filter/on_rails_env.rb
 - lib/snippr/segment_filter/valid_from.rb
 - lib/snippr/segment_filter/valid_until.rb
@@ -167,6 +168,7 @@ files:
 - spec/fixtures/withBlock.snip
 - spec/fixtures/withUnderscore/andUnderscore/aSnippet.snip
 - spec/fixtures/withViewHelperMethod.snip
+- spec/snippr/clock_spec.rb
 - spec/snippr/i18n_spec.rb
 - spec/snippr/links_spec.rb
 - spec/snippr/normalizer/camelizer_spec.rb
@@ -179,6 +181,7 @@ files:
 - spec/snippr/processor/wikilinks_spec.rb
 - spec/snippr/processor_spec.rb
 - spec/snippr/segment_filter/base_spec.rb
+- spec/snippr/segment_filter/on_host_spec.rb
 - spec/snippr/segment_filter/on_rails_env_spec.rb
 - spec/snippr/segment_filter/valid_from_spec.rb
 - spec/snippr/segment_filter/valid_until_spec.rb
@@ -229,6 +232,7 @@ test_files:
 - spec/fixtures/withBlock.snip
 - spec/fixtures/withUnderscore/andUnderscore/aSnippet.snip
 - spec/fixtures/withViewHelperMethod.snip
+- spec/snippr/clock_spec.rb
 - spec/snippr/i18n_spec.rb
 - spec/snippr/links_spec.rb
 - spec/snippr/normalizer/camelizer_spec.rb
@@ -241,6 +245,7 @@ test_files:
 - spec/snippr/processor/wikilinks_spec.rb
 - spec/snippr/processor_spec.rb
 - spec/snippr/segment_filter/base_spec.rb
+- spec/snippr/segment_filter/on_host_spec.rb
 - spec/snippr/segment_filter/on_rails_env_spec.rb
 - spec/snippr/segment_filter/valid_from_spec.rb
 - spec/snippr/segment_filter/valid_until_spec.rb

data/CHANGELOG

@@ -1,25 +0,0 @@
-== 0.3.0 (2010-07-05)
-  * Added support for links in wiki syntax:
-    
-      [[http://www.blaulabs.de|blaulabs]]
-      
-    will be converted to:
-    
-      <a href="http://www.blaulabs.de">blaulabs</a>
-
-== 0.2.0 (2010-05-13)
-  * Added support for I18n snippr files. Simply enable I18n:
-    
-      Snippr.i18n = true
-    
-    And Snippr will automatically retrieve the current locale from I18n and append
-    it to every snippr file you're trying to load:
-    
-      I18n.locale = :de
-      Snippr.load(:topup, :success) # Will load: "topup/success_de.snip"
-
-  * From the example above, you should also notice that the method for loading a
-    snippr file has changed from +new+ to +load+.
-
-== 0.1.0 (2010-04-30)
-  * Initial version.