mamiya 0.0.1.alpha20 → 0.0.1.alpha21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7ed13e8778df9ab9ce99e885013120a638a2bb6
-  data.tar.gz: 4d85eca80055453cc3aac803a6dc5c0d232d2d38
+  metadata.gz: 4a0a40c67ec9701a56d9d5454ed090bca4f8c7c4
+  data.tar.gz: c6989472920d7302838ca131b425b62715383809
 SHA512:
-  metadata.gz: efef0fb46485a44362ae151ad79eaf6baec6ade4877bf02588b802fe553e1b2115408fda4fbf5628c77ba2d141391bfc1742341d43bfea3d76b6a2a9ee51fa58
-  data.tar.gz: c8dc1424d06eda65ce392f5d8e3acd3fa7f667c0d29c1bb6993a3cad27e099c5da2ffa97b3b573fdab045e957c060edbabdc200d1cbb1ae60d3297404f669f2f
+  metadata.gz: 60cfeb34db85ab130c792c28723e91518f2367a6bf29ff9221b7b969fa956c8fb2dfd12f69e0b44143081619ac346862270ab6c46b6afb4d343cb1fe2c7ac815
+  data.tar.gz: fc6c115392f4dca0acd05aa5c4708d796a29086b4c8863a65432a82206c397829b065d063bc909a98adb5bf09d70cb6b3bbf08cd5fc9218735d55f50dc0eb62c

data/README.md

@@ -36,6 +36,12 @@ TODO: Write usage instructions here
 
 ## Upgrade Notes
 
+### 0.0.1.alpha21
+
+#### Configuration now written in Ruby
+
+You should rewrite your configuration yaml in Ruby. See examples/config.rb for example.
+
 ### 0.0.1.alpha20
 
 _tl;dr_ Don't mix alpha19 and alpha20.

data/example/Procfile

@@ -0,0 +1,2 @@
+master: bundle exec env MAMIYA_SYNC_OUT=1 mamiya master -d --serf bind=0.0.0.0:7760,rpc_addr=127.0.0.1:17760,node=${HOSTNAME}_${PORT}
+agent: bundle exec env MAMIYA_SYNC_OUT=1 sh -c 'sleep 2; mamiya agent -d --serf bind=0.0.0.0:$PORT,rpc_addr=127.0.0.1:1$PORT,join=127.0.0.1:7760,node=${HOSTNAME}_${PORT}'

data/example/config.rb

@@ -0,0 +1,9 @@
+set :storage, {
+  type: :s3,
+  bucket: ENV["MAMIYA_S3_BUCKET"] || ENV["S3_BUCKET"] || raise("specify your S3 bucket via $MAMIYA_S3_BUCKET or $S3_BUCKET"),
+  region: ENV["AWS_REGION"] || 'ap-northeast-1',
+}
+
+set :packages_dir, "#{File.dirname(__FILE__)}/dst"
+set :keep_packages, 3
+set :fetch_sleep, 2

data/example/deploy.rb

@@ -0,0 +1,34 @@
+require 'digest/sha1'
+require 'fileutils'
+require 'pathname'
+
+set :application, 'myapp'
+#set :repository, '...'
+
+#set :package_under, 'dir'
+set :exclude_from_package, ['tmp', 'log', 'spec', '.sass-cache']
+set :dereference_symlinks, true
+
+# http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?revision=45360&view=revision
+set :build_to, "#{File.dirname(__FILE__)}/pkg"
+set :deploy_to, "..."
+
+set :bundle_without, [:development, :test]
+set :bundle_dir, "#{deploy_to}/shared/bundle"
+
+#use :git, exclude_git_clean_targets: true
+
+prepare_build("bundle install") do
+  run "bundle", "install"
+end
+
+build("include assets and .bundle") do
+  exclude_from_package.reject! { |_| _ == 'public/assets/' }
+  exclude_from_package.reject! { |_| _ == '.bundle/' }
+end
+
+build("assets compile") do
+  run "bundle", "exec", "rake", "assets:precompile"
+end
+
+

data/lib/mamiya/agent.rb

@@ -76,15 +76,15 @@ module Mamiya
 
     ##
     # Returns agent status. Used for HTTP API and `serf query` inspection.
-    def status
+    def status(packages: true)
+      # When changing signature, don't forget to change samely of Master#status too
       {}.tap do |s|
-        s[:master] = false
         s[:name] = serf.name
         s[:version] = Mamiya::VERSION
 
         s[:queues] = task_queue.status
 
-        s[:packages] = self.existing_packages
+        s[:packages] = self.existing_packages if packages
       end
     end
 
@@ -135,7 +135,11 @@ module Mamiya
         end
 
         serf.respond('mamiya:status') do |event|
-          self.status.to_json
+          self.status(packages: false).to_json
+        end
+
+        serf.respond('mamiya:packages') do |event|
+          self.existing_packages.to_json
         end
       end
     end

data/lib/mamiya/agent/tasks/abstract.rb

@@ -28,14 +28,17 @@ module Mamiya
         end
 
         def execute
+          @logger.info "Task started: #{task.inspect}"
           before
           run
         rescue Exception => error
           @error = error
           raise if raise_error?
           errored
+          @logger.error "Encountered error: #{error.inspect}\n\t#{error.backtrace.join("\n\t")}"
         ensure
           after
+          @logger.info "Task finished"
         end
 
         def before

data/lib/mamiya/agent/tasks/fetch.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 require 'mamiya/agent/tasks/notifyable'
 require 'mamiya/steps/fetch'
 require 'mamiya/storages/abstract'
@@ -7,10 +9,12 @@ module Mamiya
     module Tasks
       class Fetch < Notifyable
         def run
-          logger.info "Fetching #{application}/#{package}"
-
+          prepare_destination
           take_interval
+
+          logger.info "Fetching #{application}/#{package}"
           step.run!
+
           order_cleaning
         rescue Mamiya::Storages::Abstract::AlreadyFetched
           logger.info "It has already fetched; skipping."
@@ -26,6 +30,13 @@ module Mamiya
           rand(wait)
         end
 
+        def prepare_destination
+          unless File.exist?(destination)
+            @logger.info "Creating #{destination}"
+            FileUtils.mkdir_p(destination)
+          end
+        end
+
         def order_cleaning
           task_queue.enqueue(:clean, {})
         end

data/lib/mamiya/cli.rb

@@ -1,6 +1,6 @@
 require 'mamiya'
 
-require 'mamiya/config'
+require 'mamiya/configuration'
 require 'mamiya/script'
 require 'mamiya/logger'
 
@@ -227,15 +227,15 @@ module Mamiya
 
     def config(dont_raise_error = false)
       return @config if @config
-      path = [options[:config], './mamiya.yml', './config.yml'].compact.find { |_| File.exists?(_) }
+      path = [options[:config], './mamiya.conf.rb', './config.rb'].compact.find { |_| File.exists?(_) }
 
       if path
         logger.debug "Using configuration: #{path}"
-        @config = Mamiya::Config.load(File.expand_path(path))
+        @config = Mamiya::Configuration.new.load!(File.expand_path(path))
       else
         logger.debug "Couldn't find configuration file"
         return nil if dont_raise_error
-        fatal! "Configuration File not found (try --config(-C) option or place it at ./mamiya.yml or ./config.yml)"
+        fatal! "Configuration File not found (try --config(-C) option or place it at ./config.rb)"
       end
     end
 

data/lib/mamiya/configuration.rb

@@ -0,0 +1,29 @@
+require 'mamiya/dsl'
+require 'mamiya/storages'
+
+require 'shellwords'
+
+module Mamiya
+  class Configuration < DSL
+    # common
+    set_default :serf, {}
+    set_default :storage, {}
+    set_default :show_backtrace_in_fatal, true
+
+    set_default :application, nil
+
+    # agent
+    set_default :packages_dir, nil
+    set_default :fetch_sleep, 12
+    set_default :keep_packages, 3
+
+    # master
+    set_default :master, {monitor: {refresh_interval: nil}} # TODO: don't nest
+    set_default :web, {port: 7761, bind: '0.0.0.0', environment: :development} # TODO: IPv6
+
+    def storage_class
+      Storages.find(self[:storage][:type])
+    end
+  end
+end
+

data/lib/mamiya/dsl.rb

@@ -28,7 +28,7 @@ module Mamiya
       k = name.to_sym
       return if self.instance_methods.include?(k)
 
-      define_method(k) { @variables[k] || self.class.defaults[k] }
+      define_method(k) { self[k] }
     end
 
     ##
@@ -154,6 +154,12 @@ module Mamiya
       set(k, value)
     end
 
+    ##
+    # (DSL) Retrieve value for key +key+. Value can be set using DSL#set .
+    def [](key)
+      @variables[key] || self.class.defaults[key]
+    end
+
     ##
     # (DSL) Define task named +name+ with given block.
     def task(name, &block)

data/lib/mamiya/master.rb

@@ -52,7 +52,7 @@ module Mamiya
       ).keys
     end
 
-    def status
+    def status(packages: false)
       {name: serf.name, master: true}
     end
 

data/lib/mamiya/master/agent_monitor.rb

@@ -14,6 +14,7 @@ module Mamiya
       include AgentMonitorHandlers
 
       STATUS_QUERY = 'mamiya:status'.freeze
+      PACKAGES_QUERY = 'mamiya:packages'.freeze
       DEFAULT_INTERVAL = 60
 
       def initialize(master, raise_exception: false)
@@ -99,8 +100,12 @@ module Mamiya
         end
 
         @commit_lock.synchronize { 
-          response = @master.serf.query(STATUS_QUERY, '', **kwargs)
-          response["Responses"].each do |name, json|
+          status_query_th = Thread.new { @master.serf.query(STATUS_QUERY, '', **kwargs) }
+          packages_query_th = Thread.new { @master.serf.query(PACKAGES_QUERY, '', **kwargs) }
+          status_response = status_query_th.value
+          packages_response = packages_query_th.value
+
+          status_response["Responses"].each do |name, json|
             begin
               new_statuses[name] = JSON.parse(json)
             rescue JSON::ParserError => e
@@ -110,6 +115,23 @@ module Mamiya
             end
           end
 
+          packages_response["Responses"].each do |name, json|
+            next unless new_statuses[name]
+
+            begin
+              new_statuses[name]['packages'] = JSON.parse(json)
+            rescue JSON::ParserError => e
+              logger.warn "Failed to parse packages from #{name}: #{e.message}"
+              next
+            end
+          end
+
+          (new_statuses.keys - packages_response["Responses"].keys).each do |name|
+            if @statuses[name] && @statuses[name]['packages']
+              new_statuses[name]['packages'] = @statuses[name]['packages']
+            end
+          end
+
           new_failed_agents = new_failed_agents.to_a
 
           (new_agents.keys - @agents.keys).join(", ").tap do |agents|

data/lib/mamiya/master/agent_monitor_handlers.rb

@@ -29,7 +29,7 @@ module Mamiya
 
       def task__finish(status, payload, event)
         task = payload['task']
-        logger.error "#{status['name']} finished task #{task['task']}: #{payload['error']}"
+        logger.info "#{status['name']} has finished task #{task['task'].inspect}"
 
         task__finalize(status, payload, event)
 
@@ -41,7 +41,7 @@ module Mamiya
 
       def task__error(status, payload, event)
         task = payload['task']
-        logger.error "#{status['name']} failed task #{task['task']}: #{payload['error']}"
+        logger.error "#{status['name']} has failed task #{task['task'].inspect}: #{payload['error']}"
 
         task__finalize(status, payload, event)
 

data/lib/mamiya/steps/abstract.rb

@@ -1,11 +1,10 @@
-require 'mamiya/config'
 require 'mamiya/script'
 require 'mamiya/logger'
 
 module Mamiya
   module Steps
     class Abstract
-      def initialize(script: Mamiya::Script.new, config: Mamiya::Config.new, logger: Mamiya::Logger.new, **options)
+      def initialize(script: Mamiya::Script.new, config: Mamiya::Configuration.new, logger: Mamiya::Logger.new, **options)
         @script, @config, @options = script, config, options
         @logger = logger[self.class.name.sub(/^Mamiya::Steps::/,'')]
       end

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha20"
+  VERSION = "0.0.1.alpha21"
 end

data/spec/agent/tasks/fetch_spec.rb

@@ -1,11 +1,19 @@
 require 'spec_helper'
+require 'tmpdir'
 
 require 'mamiya/agent/tasks/fetch'
 require 'mamiya/agent/tasks/notifyable'
 require 'mamiya/steps/fetch'
 
 describe Mamiya::Agent::Tasks::Fetch do
-  let(:config) { {packages_dir: File::NULL} }
+  let!(:tmpdir) { Dir.mktmpdir("mamiya-agent-tasks-fetch-spec") }
+  after { FileUtils.remove_entry_secure tmpdir }
+
+  let(:destination) { File.join(tmpdir, 'destination') }
+  let(:app_destination) { File.join(destination, 'myapp') }
+
+  let(:config) { {packages_dir: destination} }
+
   let(:agent) { double('agent', config: config) }
   let(:task_queue) { double('task_queue', enqueue: nil) }
 
@@ -21,10 +29,12 @@ describe Mamiya::Agent::Tasks::Fetch do
 
   describe "#execute" do
     before do
+      FileUtils.mkdir_p(app_destination)
+
       allow(Mamiya::Steps::Fetch).to receive(:new).with(
         application: 'myapp',
         package: 'mypkg',
-        destination: File.join(File::NULL, 'myapp'),
+        destination: app_destination,
         config: config,
       ).and_return(step)
 
@@ -43,6 +53,21 @@ describe Mamiya::Agent::Tasks::Fetch do
       task.execute
     end
 
+    context "when destination directory not exists" do
+      before do
+        FileUtils.remove_entry_secure(destination)
+      end
+      it "creates directory" do
+        allow(step).to receive(:run!) do
+          expect(Pathname.new(app_destination)).to be_exist
+        end
+
+        task.execute
+
+        expect(Pathname.new(app_destination)).to be_exist
+      end
+    end
+
     context "when already fetched" do
       it "does nothing" do
         allow(step).to receive(:run!).and_raise(Mamiya::Storages::Abstract::AlreadyFetched)

data/spec/agent_spec.rb

@@ -117,6 +117,10 @@ describe Mamiya::Agent do
 
     subject(:status) { agent.status }
 
+    it "doesn't include master=true" do
+      expect(status[:master]).to be_nil
+    end
+
     it "includes version identifier" do
       expect(status[:version]).to eq Mamiya::VERSION
     end
@@ -129,6 +133,14 @@ describe Mamiya::Agent do
       expect(status[:packages]).to eq agent.existing_packages
     end
 
+    context "with packages=false" do
+      subject(:status) { agent.status(packages: false) }
+
+      it "doesn't include existing packages" do
+        expect(status.has_key?(:packages)).to be_false
+      end
+    end
+
     describe "(task queue)" do
       it "includes task_queue" do
         expect(status[:queues]).to eq({a: {working: nil, queue: []}})
@@ -166,11 +178,18 @@ describe Mamiya::Agent do
 
   describe "query responder" do
     it "responds to 'mamiya:status'" do
-      allow(agent).to receive(:status).and_return("my" => "status")
+      allow(agent).to receive(:status).with(packages: false).and_return("my" => "status")
 
       response = serf.trigger_query('mamiya:status', '')
       expect(JSON.parse(response)).to eq("my" => "status")
     end
+
+    it "responds to 'mamiya:packages'" do
+      allow(agent).to receive(:existing_packages).and_return(%w(pkg1 pkg2))
+
+      response = serf.trigger_query('mamiya:packages', '')
+      expect(JSON.parse(response)).to eq(%w(pkg1 pkg2))
+    end
   end
 
   describe "event handler" do

data/spec/configuration_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'tmpdir'
+
+require 'mamiya/dsl'
+require 'mamiya/storages'
+
+require 'mamiya/configuration'
+
+describe Mamiya::Configuration do
+  subject(:config) { described_class.new }
+
+  it "inherits Mamiya::DSL" do
+    expect(described_class.ancestors).to include(Mamiya::DSL)
+  end
+
+  describe "#storage_class" do
+    before do
+      config.evaluate! do
+        set :storage, type: :foobar, conf: :iguration
+      end
+    end
+
+    let(:klass) { Class.new }
+
+    before do
+      allow(Mamiya::Storages).to receive(:find).with(:foobar).and_return(klass)
+    end
+
+    subject(:storage_class) { config.storage_class }
+
+    it "finds class using Storages.find" do
+      expect(storage_class).to eq klass
+    end
+  end
+end

data/spec/dsl_spec.rb

@@ -95,8 +95,10 @@ describe Mamiya::DSL do
       expect{ dsl.foo }.to raise_error
       dsl.set :foo, 100
       expect(dsl.foo).to eq 100
+      expect(dsl[:foo]).to eq 100
       dsl.set :foo, 200
       expect(dsl.foo).to eq 200
+      expect(dsl[:foo]).to eq 200
     end
   end
 
@@ -104,6 +106,7 @@ describe Mamiya::DSL do
     it "sets variable" do
       dsl.set_default :foo, 100
       expect(dsl.foo).to eq 100
+      expect(dsl[:foo]).to eq 100
     end
 
     context "when already assigned" do
@@ -111,6 +114,7 @@ describe Mamiya::DSL do
         dsl.set :foo, 100
         dsl.set_default :foo, 200
         expect(dsl.foo).to eq 100
+        expect(dsl[:foo]).to eq 100
       end
     end
   end

data/spec/master/agent_monitor_spec.rb

@@ -16,16 +16,35 @@ describe Mamiya::Master::AgentMonitor do
     described_class.new(master)
   end
 
-  describe "#refresh" do
-    let(:query_response) do
-      {
-        "Acks" => ['a'],
-        "Responses" => {
-          'a' => {"foo" => "bar"}.to_json,
-        },
-      }
+  def stub_serf_queries(expected_payload: '', expected_kwargs: {})
+    allow(serf).to receive(:query) do |query, payload, kwargs={}|
+      expect(payload).to eq expected_payload
+      expect(kwargs).to eq expected_kwargs
+      expect(%w(mamiya:status mamiya:packages)).to include(query)
+
+      {'mamiya:status' => status_query_response, 'mamiya:packages' => packages_query_response}[query]
     end
+  end
+
+  let(:status_query_response) do
+    {
+      "Acks" => ['a'],
+      "Responses" => {
+        'a' => {"foo" => "bar", 'packages' => ['pkg1']}.to_json,
+      },
+    }
+  end
+
+  let(:packages_query_response) do
+    {
+      "Acks" => ['a'],
+      "Responses" => {
+        'a' => ['pkg1','pkg2'].to_json,
+      },
+    }
+  end
 
+  describe "#refresh" do
     let(:members) do
       [
         {
@@ -38,7 +57,7 @@ describe Mamiya::Master::AgentMonitor do
     end
 
     before do
-      allow(serf).to receive(:query).with('mamiya:status', '', {}).and_return(query_response)
+      stub_serf_queries()
       allow(serf).to receive(:members).and_return(members)
     end
 
@@ -46,8 +65,49 @@ describe Mamiya::Master::AgentMonitor do
       expect {
         agent_monitor.refresh
       }.to change {
-        agent_monitor.statuses["a"]
-      }.to("foo" => "bar")
+        agent_monitor.statuses["a"] && agent_monitor.statuses["a"]['foo']
+      }.to('bar')
+    end
+
+    it "updates status .packages by packages query" do
+      expect {
+        agent_monitor.refresh
+      }.to change {
+        agent_monitor.statuses["a"] && agent_monitor.statuses["a"]['packages']
+      }.to(%w(pkg1 pkg2))
+    end
+
+    context "when packages query unavailable, but available in status query" do
+      let(:packages_query_response) do
+        {
+          "Acks" => ['a'],
+          "Responses" => {
+          },
+        }
+      end
+
+      it "updates status .packages from status" do
+        expect {
+          agent_monitor.refresh
+        }.to change {
+          agent_monitor.statuses["a"] && agent_monitor.statuses["a"]['packages']
+        }.to(%w(pkg1))
+      end
+    end
+
+    context "when failed to retrieve package list, but it was available previously in packages query" do
+      before do
+        agent_monitor.refresh
+        packages_query_response['Responses'] = {}
+      end
+
+      it "keeps previous list" do
+        expect {
+          agent_monitor.refresh
+        }.not_to change {
+          agent_monitor.statuses["a"]['packages']
+        }
+      end
     end
 
     it "updates #agents" do
@@ -80,7 +140,7 @@ describe Mamiya::Master::AgentMonitor do
     end
 
     context "when some agent returned invalid status" do
-      let(:query_response) do
+      let(:status_query_response) do
         {
           "Acks" => ['a'],
           "Responses" => {
@@ -99,15 +159,15 @@ describe Mamiya::Master::AgentMonitor do
     end
 
     context "with argument" do
-      it "passes args to serf query" do
-        expect(serf).to receive(:query).with('mamiya:status', '', node: 'foo').and_return(query_response)
+      it "passes args to serf query", pending: 'stub_serf_queries cannot handle kwarg' do
+        stub_serf_queries(expected_kwargs: {node: 'foo'})
         agent_monitor.refresh(node: 'foo')
       end
     end
   end
 
   describe "(commiting events)" do
-    let(:query_response) do
+    let(:status_query_response) do
       {
         "Acks" => ['a'],
         "Responses" => {
@@ -116,6 +176,14 @@ describe Mamiya::Master::AgentMonitor do
       }
     end
 
+    let(:packages_query_response) do
+      {
+        "Acks" => ['a'],
+        "Responses" => {
+        },
+      }
+    end
+
     let(:members) do
       [
         {
@@ -142,7 +210,7 @@ describe Mamiya::Master::AgentMonitor do
     end
 
     before do
-      allow(serf).to receive(:query).with('mamiya:status', '', {}).and_return(query_response)
+      stub_serf_queries()
       allow(serf).to receive(:members).and_return(members)
 
       agent_monitor.refresh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha20
+  version: 0.0.1.alpha21
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,6 +171,9 @@ files:
 - docs/sequences/deploy.png
 - docs/sequences/deploy.uml
 - example.rb
+- example/Procfile
+- example/config.rb
+- example/deploy.rb
 - lib/mamiya.rb
 - lib/mamiya/agent.rb
 - lib/mamiya/agent/actions.rb
@@ -183,7 +186,7 @@ files:
 - lib/mamiya/agent/tasks/notifyable.rb
 - lib/mamiya/cli.rb
 - lib/mamiya/cli/client.rb
-- lib/mamiya/config.rb
+- lib/mamiya/configuration.rb
 - lib/mamiya/dsl.rb
 - lib/mamiya/helpers/git.rb
 - lib/mamiya/logger.rb
@@ -215,7 +218,7 @@ files:
 - spec/agent/tasks/fetch_spec.rb
 - spec/agent/tasks/notifyable_spec.rb
 - spec/agent_spec.rb
-- spec/config_spec.rb
+- spec/configuration_spec.rb
 - spec/dsl_spec.rb
 - spec/fixtures/dsl_test_load.rb
 - spec/fixtures/dsl_test_use.rb
@@ -274,7 +277,7 @@ test_files:
 - spec/agent/tasks/fetch_spec.rb
 - spec/agent/tasks/notifyable_spec.rb
 - spec/agent_spec.rb
-- spec/config_spec.rb
+- spec/configuration_spec.rb
 - spec/dsl_spec.rb
 - spec/fixtures/dsl_test_load.rb
 - spec/fixtures/dsl_test_use.rb

data/lib/mamiya/config.rb

@@ -1,57 +0,0 @@
-require 'yaml'
-require 'mamiya/storages'
-
-module Mamiya
-  class Config
-    def self.load(file)
-      self.new YAML.load(ERB.new(File.read(file)).result(binding))
-    end
-
-    def initialize(config_hash = {})
-      @config = symbolize_keys_in(config_hash)
-    end
-
-    def [](key)
-      @config[key]
-    end
-
-    def []=(key, value)
-      @config[key] = value
-    end
-
-    def storage_class
-      self[:storage] && Storages.find(self[:storage][:type])
-    end
-
-    def deploy_to_for_app(app)
-      # TODO: test
-      app = app.to_sym
-
-      if self[:apps] && self[:applications][app]
-        Pathname.new(self[:applications][app][:deploy_to])
-      end
-    end
-
-    def releases_path_for_app(app)
-      # TODO: test
-      deploy_to_for_app(app).join('releases')
-    end
-
-    private
-
-    def symbolize_keys_in(hash)
-      Hash[hash.map { |k, v|
-        case v
-        when Hash
-          v = symbolize_keys_in(v)
-        when Array
-          if v.find { |_| _.kind_of?(Hash) }
-            v = v.map { |_| _.kind_of?(Hash) ? symbolize_keys_in(_) : _ }
-          end
-        end
-
-        [k.to_sym, v]
-      }]
-    end
-  end
-end

data/spec/config_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-require 'mamiya/storages'
-
-require 'mamiya/config'
-
-describe Mamiya::Config do
-  let(:source) do
-    {
-      "test" => {
-        "a" => ["b" => {"c" => {"d" => "e"}}]
-      },
-      :test2 => :hello
-    }
-  end
-  subject(:config) { described_class.new(source) }
-
-  describe ".load" do
-    let(:fixture_path) { File.join(__dir__, 'fixtures', 'test.yml') }
-
-    subject(:config) { described_class.load(fixture_path) }
-
-    it { should be_a(described_class) }
-
-    it "loads configuration from file" do
-      expect(config[:a][:e]).to eq "f"
-    end
-  end
-
-  it "symbolizes keys" do
-    expect(config[:test][:a][0][:b][:c][:d]).to eq "e"
-    expect(config[:test2]).to eq :hello
-  end
-
-  describe "#storage_class" do
-    let(:source) do
-      {storage: {type: :foobar, conf: :iguration}}
-    end
-    let(:klass) { Class.new }
-
-    before do
-      allow(Mamiya::Storages).to receive(:find).with(:foobar).and_return(klass)
-    end
-
-    subject(:storage_class) { config.storage_class }
-
-    it "finds class using Storages.find" do
-      expect(storage_class).to eq klass
-    end
-  end
-end