all_seeing_pi 0.0.2 → 0.0.3

data/.gitignore

@@ -16,4 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 test/fixtures/vcr_cassettes/
-test/aws.yml
+test/all_seeing_pi.yml

data/lib/all_seeing_pi.rb

@@ -2,8 +2,22 @@ require "all_seeing_pi/version"
 require "all_seeing_pi/golem"
 require "all_seeing_pi/camera"
 require "all_seeing_pi/uploader"
+require "all_seeing_pi/configuration"
 
 module AllSeeingPi
+  class << self
+    attr_accessor :config
+  end
+
+  def self.config
+    @config ||= Configuration.new
+  end
+
+  def self.configure
+    self.config ||= Configuration.new
+    yield(config)
+  end
+
   def self.watch
     golem = AllSeeingPi::Golem.new
 

data/lib/all_seeing_pi/configuration.rb

@@ -0,0 +1,41 @@
+module AllSeeingPi
+  class Configuration
+    attr_accessor :aws_key, :aws_secret, :redis_host, :redis_password
+
+    def initialize
+      reset!
+      load_config_from_file
+    end
+
+    def reset!
+      instance_variables.each do |var|
+        instance_variable_set(var, nil)
+      end
+    end
+
+    def [](key)
+      send(key)
+    end
+
+    def []=(key, value)
+      send("#{key}=", value)
+    end
+
+    def load_config_from_file(filename = 'all_seeing_pi.yml')
+      paths = [
+        "#{filename}",
+        "config/#{filename}"
+      ]
+
+      config = {}
+
+      paths.each do |filepath|
+        config = YAML.load_file(filepath) if File.exists?(filepath)
+      end
+
+      config.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+  end
+end

data/lib/all_seeing_pi/uploader.rb

@@ -8,6 +8,7 @@ module AllSeeingPi
 
     def initialize
       @s3 = AWS::S3.new
+      require 'pry'; binding.pry if $debug
     end
 
     def upload(image_path)

data/lib/all_seeing_pi/version.rb

@@ -1,3 +1,3 @@
 module AllSeeingPi
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_all_seeing_pi.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class AllSeeingPiTest < MiniTest::Unit::TestCase
+  def setup
+    @config = AllSeeingPi.config
+  end
+
+  def teardown
+    AllSeeingPi.config.reset!
+  end
+
+  def test_config_with_block
+    AllSeeingPi.configure do |config|
+      config.aws_key = 'test_config_with_block_aws_key'
+    end
+
+    assert_equal 'test_config_with_block_aws_key', AllSeeingPi.config[:aws_key]
+  end
+
+  def test_setting_config_directly
+    AllSeeingPi.config.aws_key = 'test_setting_config_directly_key'
+
+    assert_equal 'test_setting_config_directly_key', AllSeeingPi.config[:aws_key]
+  end
+
+  def test_resetting_config
+    AllSeeingPi.config.aws_key = 'test_resetting_config_key'
+    AllSeeingPi.config.reset!
+
+    assert_nil AllSeeingPi.config[:aws_key]
+  end
+
+  def test_that_config_merges_local_configuration_from_all_seeing_pi_yml
+    filename = 'all_seeing_pi.yml'
+    File.write(filename, "aws_key: 'test_config_merge_key'")
+    AllSeeingPi.config.load_config_from_file
+
+    assert_equal 'test_config_merge_key', AllSeeingPi.config[:aws_key]
+  ensure
+    FileUtils.rm(filename)
+  end
+end

data/test/test_configuration.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class ConfigurationTest < MiniTest::Unit::TestCase
+  def setup
+    @config = AllSeeingPi.config
+  end
+
+  def test_load_config_from_file
+    filename = 'test_config.yml'
+    File.write(filename, "aws_key: totally_fake")
+
+    @config.load_config_from_file('test_config.yml')
+
+    assert_equal 'totally_fake', AllSeeingPi.config[:aws_key]
+  ensure
+    FileUtils.rm(filename)
+  end
+end

data/test/test_helper.rb

@@ -10,6 +10,10 @@ VCR.configure do |c|
   c.hook_into :webmock
 end
 
-AWS.config(YAML.load_file('test/aws.yml'))
+AllSeeingPi.config.load_config_from_file('test/all_seeing_pi.yml')
 
+AWS.config(
+  access_key_id: AllSeeingPi.config[:aws_key],
+  secret_access_key: AllSeeingPi.config[:aws_secret]
+)
 ENV['ALL_SEEING_PI_ENV'] = 'test'

data/test/test_uploader.rb

@@ -21,4 +21,13 @@ class UploaderTest < MiniTest::Unit::TestCase
       assert_match /#{@bucket_name}/, name
     end
   end
+
+  def test_uploader_uses_credentials_from_config
+    AllSeeingPi.config[:aws_key] = 'test_key'
+    AllSeeingPi.config[:aws_secret] = 'test_secret'
+    uploader = AllSeeingPi::Uploader.new
+
+    key, secret = AllSeeingPi.config[:aws_key], AllSeeingPi.config[:aws_secret]
+    assert_equal ['test_key', 'test_secret'], [key, secret]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: all_seeing_pi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,11 +141,14 @@ files:
 - capture.sh
 - lib/all_seeing_pi.rb
 - lib/all_seeing_pi/camera.rb
+- lib/all_seeing_pi/configuration.rb
 - lib/all_seeing_pi/golem.rb
 - lib/all_seeing_pi/uploader.rb
 - lib/all_seeing_pi/version.rb
 - test/fixtures/eye_of_sauron.jpg
+- test/test_all_seeing_pi.rb
 - test/test_camera.rb
+- test/test_configuration.rb
 - test/test_helper.rb
 - test/test_palantir.rb
 - test/test_uploader.rb
@@ -176,7 +179,9 @@ specification_version: 3
 summary: A gem to capture images with a Raspberry Pi camera.
 test_files:
 - test/fixtures/eye_of_sauron.jpg
+- test/test_all_seeing_pi.rb
 - test/test_camera.rb
+- test/test_configuration.rb
 - test/test_helper.rb
 - test/test_palantir.rb
 - test/test_uploader.rb