timberline 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aa514d129ba4ac74886845982675b82975051bb
-  data.tar.gz: d668a59889b0f78d60e04321b2a0224c1264712e
+  metadata.gz: 29b010166f8c116bf4469cf6c09d3d65b0f769ee
+  data.tar.gz: a06cc3487b8acaef76c85c87b7b56d32bd11785d
 SHA512:
-  metadata.gz: 3f44d9c9e5f008d8b01e0ee8e008a6e4adeb22ca4db90dfffde5b5e3a2aa263976cc0d89f4a82217a639a2dbfafcefb7bcd9864f0df86c5178fe65452490a36b
-  data.tar.gz: 5ff02917829e79ddf5d7f8e0d9e99a35bd35df784893a54773dcde8878f351633bad12de48587e8a5dbac62fd9421c3a5fb1701ddfde36e5e029b8ebd6771216
+  metadata.gz: 6d5ced0644e73be8bd3bce8905e46d99ddeb36c61ae7e78890a8bbd9fa727fd8969301ee4e074e5d4518dda7aa77046238e7f068e48dc4da5968fc899398f682
+  data.tar.gz: 75f4e3acc70d27d9021e8c0d4816f31ac40854a7a30f8bba1d625fb6a3498de8de12a3b89c99fe7102a4bea1a21c7903d4c69232557d87541a7a721f8174991f

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.6.0
+  - Remove Rails-specific configuration logic in preparation for release of timberline-rails
 0.5.0
   - Each queue now has its own error queue, rather than having one error_queue for everything
   - Queues can now be created with a 'hidden' option that removes them from the Timberline listing

data/README.markdown

@@ -77,24 +77,16 @@ queue (more on that later). There are 3 ways to configure Timberline:
    your settings will all take effect. Redis defaults will be used if you omit
    anything.
 
-2. If you're including Timberline in a Rails app, there's a convenient way to
-   configure it that should fit in with the rest of your app - if you include a
-   yaml file named timberline.yaml in your config directory, Timberline will
-   automatically detect it and load it up. The syntax for this file is
-   shockingly boring:
+2. If you prefer a static config file, you can write a YAML file like the following:
 
-        development:
           database: 1
           host: 192.168.1.105
           port: 12345
           password: foobar
-        production:
-          ...etc.
 
-3. Like the yaml format but you're not using Rails? Don't worry, just write your
-   yaml file and set the TIMBERLINE\_YAML constant inside your app like so:
+  ...and then use the `TIMBERLINE_YAML` constant to specify the file's location:
 
-        TIMBERLINE_YAML = 'path/to/your/yaml/file.yaml'
+          TIMBERLINE_YAML = 'path/to/your/yaml/file.yaml'
 
 ### Pushing jobs onto a queue
 
@@ -167,6 +159,11 @@ queue.
 There are some options to the Timberline binary that you may find helpful -
 `timberline --help` for more. 
 
+### Rails
+
+If you're using Timberline in conjunction with a Rails environment, check out
+the [timberline-rails](https://github.com/treehouse/timberline-rails) gem.
+
 ## TODO
 
 Still to be done:
@@ -180,8 +177,6 @@ Still to be done:
   cumbersome. Need to rewrite some of the basic stuff to be more OO-appropriate.
 - **Forking** - Timberline should support forking in its watcher model so that jobs can
   be run in parallel and independently of each other.
-- **Relocate Rails** - Create a `timberline-rails` gem that includes all of our Rails-specific
-  functionality and configuration rather than have that in Timberline proper.
 
 ## Future
 

data/lib/timberline/config.rb

@@ -10,18 +10,18 @@ class Timberline
         else
           raise "Specified Timberline config file #{TIMBERLINE_YAML} is not present."
         end
-      elsif defined? Rails.root
-        config_file = File.join(Rails.root, 'config', 'timberline.yaml')
-        if File.exists?(config_file)
-          configs = YAML.load_file(config_file)
-          config = configs[Rails.env]
-          load_from_yaml(config)
-        end
       end
+    end
+
+    def namespace
+      @namespace ||= 'timberline'
+    end
 
-      # load defaults
-      @namespace  ||= 'timberline'
+    def max_retries
       @max_retries ||= 5
+    end
+
+    def stat_timeout
       @stat_timeout ||= 60
     end
 

data/lib/timberline/version.rb

@@ -1,3 +1,3 @@
 class Timberline
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/lib/timberline/config_spec.rb

@@ -52,70 +52,6 @@ describe Timberline::Config do
       end
     end
 
-    context "if Rails.root is defined" do
-      context "and a config/timberline.yaml file exists" do
-        before do
-          SpecSupport::FakeRails.create_fake_env
-        end
-
-        after do
-          SpecSupport::FakeRails.destroy_fake_env
-        end
-
-        it "loads the host variable from the config file" do
-          expect(subject.host).to eq("localhost")
-        end
-
-        it "loads the port variable from the config file" do
-          expect(subject.port).to eq(12345)
-        end
-
-        it "loads the timeout variable from the config file" do
-          expect(subject.timeout).to eq(10)
-        end
-
-        it "loads the password from the config file" do
-          expect(subject.password).to eq("foo")
-        end
-
-        it "loads the database from the config file" do
-          expect(subject.database).to eq(3)
-        end
-
-        it "loads the namespace from the config file" do
-          expect(subject.namespace).to eq("treecurve")
-        end
-      end
-
-      context "and a config/timberline.yaml file does not exist" do
-        before do
-          SpecSupport::FakeRails.create_fake_env_without_config
-        end
-
-        after do
-          SpecSupport::FakeRails.destroy_fake_env
-        end
-
-        it "configures a default namespace of 'timberline'" do
-          expect(subject.namespace).to eq("timberline")
-        end
-
-        it "configures a default max_retries of 5" do
-          expect(subject.max_retries).to eq(5)
-        end
-
-        it "configures a stat_timeout of 60" do
-          expect(subject.stat_timeout).to eq(60)
-        end
-
-        it "doesn't configure any redis settings so that redis will use its own defaults" do
-          [:database, :host, :port, :timeout, :password, :logger].each do |value|
-            expect(subject.send(value)).to be_nil
-          end
-        end
-      end
-    end
-
     context "when no configuration exists" do
       it "configures a default namespace of 'timberline'" do
         expect(subject.namespace).to eq("timberline")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timberline
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tommy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -148,13 +148,11 @@ files:
 - lib/timberline/queue.rb
 - lib/timberline/version.rb
 - spec/config/test_config.yaml
-- spec/fake_rails/config/timberline.yaml
 - spec/lib/timberline/config_spec.rb
 - spec/lib/timberline/envelope_spec.rb
 - spec/lib/timberline/queue_spec.rb
 - spec/lib/timberline_spec.rb
 - spec/spec_helper.rb
-- spec/support/fake_rails.rb
 - spec/support/timberline_reset.rb
 - spec/support/timberline_yaml.rb
 - timberline.gemspec

data/spec/fake_rails/config/timberline.yaml

@@ -1,7 +0,0 @@
-development:
-  host: localhost
-  port: 12345
-  timeout: 10
-  password: foo
-  database: 3
-  namespace: treecurve

data/spec/support/fake_rails.rb

@@ -1,17 +0,0 @@
-module SpecSupport
-  module FakeRails
-    def self.create_fake_env
-      fake_rails = OpenStruct.new(root: File.join(File.dirname(File.path(__FILE__)), "..", "fake_rails"), env: "development") 
-      Object.send(:const_set, :Rails, fake_rails)
-    end
-
-    def self.create_fake_env_without_config
-      fake_rails = OpenStruct.new(root: File.join(File.dirname(File.path(__FILE__)), "..", "gibberish"), env: "development") 
-      Object.send(:const_set, :Rails, fake_rails)
-    end
-
-    def self.destroy_fake_env
-      Object.send(:remove_const, :Rails)
-    end
-  end
-end