heroku_san 4.0.4 → 4.0.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log (curated)
 
+## v4.0.5
+
+  * Remove ActiveSupport dependency
+
 ## v4.0.2
 
   * Closes #110

data/heroku_san.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<heroku-api>, ['>= 0.1.2'])
       s.add_runtime_dependency(%q<rake>)
-      s.add_runtime_dependency('activesupport')
       s.add_development_dependency(%q<rails>, ['>= 2'])
       s.add_development_dependency(%q<rspec>)
       s.add_development_dependency(%q<aruba>)

data/lib/heroku_san.rb

@@ -6,7 +6,14 @@ require 'heroku_san/deploy/rails'
 require 'heroku_san/deploy/sinatra'
 
 module HerokuSan
-  mattr_accessor :project
+  class << self
+    def project
+      @project
+    end
+    def project=(project)
+      @project = project
+    end
+  end
   class NoApps < StandardError; end
   class MissingApp < StandardError; end
   class Deprecated < StandardError; end

data/lib/heroku_san/project.rb

@@ -1,6 +1,3 @@
-require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/hash/slice'
-
 module HerokuSan
   class Project
     attr_reader :config_file
@@ -14,7 +11,7 @@ module HerokuSan
       config = parse(@config_file)
       config.each do |stage, settings|
         # TODO: Push this eval later (j.i.t.)
-        @app_settings[stage] = HerokuSan::Stage.new(stage, settings.merge(options.slice(:deploy)))
+        @app_settings[stage] = HerokuSan::Stage.new(stage, settings.merge('deploy' => (options[:deploy]||options['deploy'])))
       end
     end
 
@@ -45,7 +42,7 @@ module HerokuSan
     end
   
     def apps
-      if @apps.present?
+      if @apps && !@apps.empty?
         @apps
       else
         @apps = if all.size == 1
@@ -113,4 +110,4 @@ module HerokuSan
       app_settings  
     end
   end
-end
+end

data/lib/heroku_san/stage.rb

@@ -1,8 +1,5 @@
 require 'heroku-api'
 require 'json'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/slice'
 
 MOCK = false unless defined?(MOCK)
 
@@ -16,7 +13,7 @@ module HerokuSan
         'deploy' => HerokuSan::Deploy::Rails
       }
       @name = stage
-      @options = default_options.merge(options.stringify_keys)
+      @options = default_options.merge(options)
     end
     
     def heroku
@@ -85,8 +82,10 @@ module HerokuSan
     end
     
     def create
-      params = @options.slice('app', 'stack').stringify_keys
-      params['name'] = params.delete('app')
+      params = {
+          'name' => @options['app'],
+          'stack' => @options['stack']
+      }
       response = heroku.post_app(params)
       response.body['name']
     end
@@ -104,7 +103,7 @@ module HerokuSan
     end
     
     def push_config(options = nil)
-      params = (options || config).stringify_keys
+      params = (options || config)
       heroku.put_config_vars(app, params).body
     end
 

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

data/spec/heroku_san/stage_spec.rb

@@ -219,15 +219,15 @@ describe HerokuSan::Stage do
 
   describe "#push_config" do
     it "updates the configuration settings on Heroku" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {:FOO => 'bar', :DOG => 'emu'}})
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
       with_app(subject, 'name' => subject.app) do |app_data|
         subject.push_config.should == STOCK_CONFIG.merge('FOO' => 'bar', 'DOG' => 'emu')
       end
     end
     it "pushes the options hash" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {:FOO => 'bar', :DOG => 'emu'}})
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
       with_app(subject, 'name' => subject.app) do |app_data|
-        subject.push_config(:RACK_ENV => 'magic').should == STOCK_CONFIG.merge('RACK_ENV' => 'magic')
+        subject.push_config('RACK_ENV' => 'magic').should == STOCK_CONFIG.merge('RACK_ENV' => 'magic')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -46,22 +46,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4481926893784292258
+      hash: 676383002045527270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: