tidy_reset 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dfac396bf01cba613e7d43a88f111983eca7786
-  data.tar.gz: 7bf9c15e7f6ad4bd1937eba79ebb26e358583f01
+  metadata.gz: 7e4be60e9fd7b99c31bd8ffff061911dcfa61f26
+  data.tar.gz: 1085ff55b83971aac52ff1be6719911e8b83af09
 SHA512:
-  metadata.gz: b5d0052b3e2ccda5a0516daafec4b6b989a96d7e926b8f2cee692b4c60ab34c73708831d7e8a1da2055179b78da7f03c7b36e03e56c52c09c52752c7d3a77f8e
-  data.tar.gz: 6b82ccbbd804e68549f06239eb1bbb97c3f35c0019c8794cfdd232bdc6ca4d0ed47ec067d9bc3d406d566abeee5d3571db0960d0de105f1abfd7776787c941b5
+  metadata.gz: 9d5c85c33315bb752eafa77f2ab06b09f60ac77fcaf1be9aee9f7a229ca49aee9ea751ecc4b86d0b8a689a660f5b1b53d520bb10feec6c92ef52bf7471133239
+  data.tar.gz: b094be0064f1f3daaac1d5eca10760d72632988d17143af2b2444182eaf145a87d654fe73055cf5e4b09bf39a21949a66df0c40080beacf96af9cda0edca37d7

data/VERSION

@@ -1 +1 @@
-0.1.23
+0.1.24

data/lib/tidy_reset/application_manager.rb

@@ -2,12 +2,12 @@ require 'platform-api'
 
 module TidyReset
   class ApplicationManager
-    attr_accessor :name
+    attr_accessor :name, :token
 
     def initialize(options)
       @name = options.fetch(:name)
-      token = options.fetch(:token)
-      @heroku = PlatformAPI.connect_oauth(token)
+      @token = options.fetch(:token)
+      @heroku = PlatformAPI.connect_oauth(@token)
     end
 
     def enable_maintenance_mode

data/lib/tidy_reset.rb

@@ -82,11 +82,19 @@ module TidyReset
     end
 
     def create_application_manager(application_name)
-      token = configuration.token
+      token = if configuration.token
+        configuration.token
+      else
+        auth_token_cli
+      end
       raise NoTokenException unless token
       self::ApplicationManager.new(name: application_name, token: token)
     end
 
+    def auth_token_cli
+      Bundler.with_clean_env { `heroku auth:token`.chomp }
+    end
+
     def master_connection_from_db_config(db_config)
       # Get connection to master/maintenance database 'postgres'
       pool = ActiveRecord::Base.send(establish_connection_method, db_config.merge(

data/spec/tidy_reset/tidy_reset_spec.rb

@@ -72,11 +72,20 @@ describe "TidyReset" do
       end
       TidyReset.create_application_manager('application-name').should be_a TidyReset::ApplicationManager
     end
-    it "should require an oauth_token to be set on the configuration" do 
+    it "should use the configuration token if it is set" do 
       TidyReset.configure do |config|
+        config.token = 'abc'
+      end
+      app_manager = TidyReset.create_application_manager('application-name')
+      app_manager.token.should == 'abc'
+    end
+    it "should use the heroku command to get the current user's token if the configuraiton is not set" do 
+      TidyReset.configure do |config| 
         config.token = nil
       end
-      expect { TidyReset.create_application_manager('application_manager') }.to raise_error(TidyReset::NoTokenException)
+      TidyReset.should_receive(:auth_token_cli).and_return('def')
+      app_manager = TidyReset.create_application_manager('application-name')
+      app_manager.token.should == 'def'
     end
   end
 end

data/tidy_reset.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tidy_reset 0.1.23 ruby lib
+# stub: tidy_reset 0.1.24 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tidy_reset"
-  s.version = "0.1.23"
+  s.version = "0.1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tidy_reset
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Thinknear