clusterfsck 0.1.5.0 → 0.1.5.2

data/README.md

@@ -112,7 +112,11 @@ reader = ClusterFsck::Reader.new(:stripe)
 reader.read[:api_key] # loads config_bucket/cluster_fsck_env/stripe and returns the api_key from the hash
 ```
 
-The ClusterFsck::Reader instance will load the configuration for the environment stored in the CLUSTER_FSCK_ENV.
+The ClusterFsck::Reader instance will load the configuration for the environment stored in the first defined CLUSTER_FSCK_ENV lookup location as described above.
+
+ClusterFsck is currently Ruby only, but any links or pull requests for other language implementations of the Reader module are welcome, and should be able to cooperate happily with the Ruby version.
+
+This code is MIT licensed, see LICENSE.txt file.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/lib/clusterfsck.rb

@@ -9,10 +9,11 @@ require 'commander'
 module ClusterFsck
   CLUSTER_FSCK_PATHS = ['./.clusterfsck','/usr/clusterfsck','~/.clusterfsck']
 
-  CLUSTER_FSCK_CONFIG = CLUSTER_FSCK_PATHS.map do |path_string|
-    path = File.expand_path(path_string)
-    YAML.load_file(path) if File.exists?(path)
-  end.compact.first || {}
+  CONFIG_PATH = CLUSTER_FSCK_PATHS.detect do |path_string|
+    File.exists?(File.expand_path(path_string))
+  end
+
+  CLUSTER_FSCK_CONFIG = YAML.load(File.expand_path(CONFIG_PATH))
 
   def self.logger=(logger)
     @logger = logger
@@ -24,11 +25,11 @@ module ClusterFsck
 
   def self.cluster_fsck_env
     raise "Configuration failure, check ~/.clusterfsck or other config values" unless config_bucket
-    @env ||= ENV['CLUSTER_FSCK_ENV'] || CLUSTER_FSCK_CONFIG['cluster_fsck_env'] || default_env
+    @env ||= ENV['CLUSTER_FSCK_ENV'] || self.config_hash['cluster_fsck_env'] || default_env
   end
 
   def self.config_bucket
-    @config_bucket ||= ENV['CLUSTER_FSCK_BUCKET'] || CLUSTER_FSCK_CONFIG['cluster_fsck_bucket'] || Setup.config
+    @config_bucket ||= ENV['CLUSTER_FSCK_BUCKET'] || self.config_hash['cluster_fsck_bucket'] || Setup.config
   end
 
   def self.default_env
@@ -36,7 +37,7 @@ module ClusterFsck
   end
 
   def self.config_hash
-    CLUSTER_FSCK_CONFIG
+    CLUSTER_FSCK_CONFIG || {}
   end
 
 end

data/lib/clusterfsck/credential_grabber.rb

@@ -34,11 +34,11 @@ module ClusterFsck
     end
 
     def from_cluster_fsck_config
-      if ClusterFsck::CLUSTER_FSCK_CONFIG['aws_access_key_id'] &&
-         ClusterFsck::CLUSTER_FSCK_CONFIG['aws_secret_access_key']
+      if ClusterFsck.config_hash['aws_access_key_id'] &&
+         ClusterFsck.config_hash['aws_secret_access_key']
         {
-            access_key_id: ClusterFsck::CLUSTER_FSCK_CONFIG['aws_access_key_id'],
-            secret_access_key: ClusterFsck::CLUSTER_FSCK_CONFIG['aws_secret_access_key'],
+            access_key_id: ClusterFsck.config_hash['aws_access_key_id'],
+            secret_access_key: ClusterFsck.config_hash['aws_secret_access_key'],
         }
       end
     end

data/lib/clusterfsck/setup.rb

@@ -10,20 +10,20 @@ module ClusterFsck
         variables, so you can set the environment to override the files. The bucket is read from CLUSTER_FSCK_BUCKET
         and the environment (production, staging, development, etc) is read from CLUSTER_FSCK_ENV.
       UI
-      unless ClusterFsck::CLUSTER_FSCK_CONFIG['cluster_fsck_bucket']
+      unless ClusterFsck.config_hash['cluster_fsck_bucket']
         set_bucket_name
       end
       unless ClusterFsck::CredentialGrabber.find
         set_aws_keys
       end
-      unless ClusterFsck::S3Methods.s3.buckets[ClusterFsck::CLUSTER_FSCK_CONFIG['cluster_fsck_bucket']].exists?
+      unless ClusterFsck::S3Methods.s3.buckets[ClusterFsck.config_hash['cluster_fsck_bucket']].exists?
         warn_create_bucket
       end
-      ClusterFsck::CLUSTER_FSCK_CONFIG['cluster_fsck_env'] ||= ClusterFsck.default_env
+      ClusterFsck.config_hash['cluster_fsck_env'] ||= ClusterFsck.default_env
       File.open(File.expand_path(ClusterFsck::CLUSTER_FSCK_PATHS[2]), 'w') do |f|
         f.write(YAML.dump(ClusterFsck.config_hash))
       end
-      ClusterFsck::CLUSTER_FSCK_CONFIG['cluster_fsck_bucket']
+      ClusterFsck.config_hash['cluster_fsck_bucket']
     end
 
     def self.set_bucket_name
@@ -33,12 +33,12 @@ module ClusterFsck
         #{random_name}
       UI
       input_name = ask("bucket name: ")
-      CLUSTER_FSCK_CONFIG['cluster_fsck_bucket'] = input_name.empty? ? random_name : input_name
+      ClusterFsck.config_hash['cluster_fsck_bucket'] = input_name.empty? ? random_name : input_name
     end
 
     def self.set_aws_keys
-      CLUSTER_FSCK_CONFIG['aws_access_key_id'] = ask("Enter your AWS access key: ")
-      CLUSTER_FSCK_CONFIG['aws_secret_access_key'] = ask("Enter your AWS secret access key: ")
+      ClusterFsck.config_hash['aws_access_key_id'] = ask("Enter your AWS access key: ")
+      ClusterFsck.config_hash['aws_secret_access_key'] = ask("Enter your AWS secret access key: ")
     end
 
     def self.warn_create_bucket

data/lib/clusterfsck/version.rb

@@ -1,3 +1,3 @@
 module ClusterFsck
-  VERSION = "0.1.5.0"
+  VERSION = "0.1.5.2"
 end

data/spec/lib/clusterfsck/credential_grabber_spec.rb

@@ -57,9 +57,9 @@ module ClusterFsck
     describe "when there is a ~/.clusterfsck config and with or without a ~/.fog file" do
       before do
         credential_grabber.stub(:exists?).with(true)
-        ClusterFsck::CLUSTER_FSCK_CONFIG.should_receive(:[]).at_least(:once)
+        ClusterFsck.config_hash.should_receive(:[]).at_least(:once)
           .with('aws_access_key_id').and_return(cf_credentials[:access_key_id])
-        ClusterFsck::CLUSTER_FSCK_CONFIG.should_receive(:[]).at_least(:once)
+        ClusterFsck.config_hash.should_receive(:[]).at_least(:once)
           .with('aws_secret_access_key').and_return(cf_credentials[:secret_access_key])
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clusterfsck
 version: !ruby/object:Gem::Version
-  version: 0.1.5.0
+  version: 0.1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk