cluster-fuck 0.1.0 → 0.1.1

data/lib/cluster-fuck/cli.rb

@@ -1,4 +1,5 @@
 require_relative "../cluster-fuck"
+require_relative "commands/amicus_env_argument_parser"
 require_relative "commands/edit"
 require_relative "commands/create"
 require_relative "commands/list"

data/lib/cluster-fuck/commands/amicus_env_argument_parser.rb

@@ -0,0 +1,22 @@
+module ClusterFuck
+  module Commands
+    module AmicusEnvArgumentParser
+
+      def self.included(base)
+        [:amicus_env, :key].each do |reader_key|
+          base.send(:attr_reader, reader_key) unless base.respond_to?(:reader_key)
+        end
+      end
+
+      def set_amicus_env_and_key_from_args(args)
+        if args.length > 1
+          @amicus_env, @key = args
+        else
+          @key = args.first
+        end
+      end
+
+
+    end
+  end
+end

data/lib/cluster-fuck/commands/create.rb

@@ -5,10 +5,12 @@ module ClusterFuck
   module Commands
     class Create
       include ClusterFuck::S3Methods
+      include AmicusEnvArgumentParser
 
       attr_reader :key
       def run_command(args, options = {})
-        @key = args.first
+        set_amicus_env_and_key_from_args(args)
+
         obj = s3_object(key)
         raise ConflictError, "#{key} already exists!" if obj.exists?
         obj.write('')

data/lib/cluster-fuck/commands/edit.rb

@@ -4,10 +4,12 @@ module ClusterFuck
   module Commands
     class Edit
       include Commander::UI
+      include AmicusEnvArgumentParser
 
       attr_reader :key, :options
       def run_command(args, options = Hashie::Mash.new)
-        @key = args.first
+        set_amicus_env_and_key_from_args(args)
+
         @options = options
         raise ArgumentError, "File #{key} is overridden locally! use --force to force" if reader.has_local_override? and !options.force
 
@@ -16,11 +18,11 @@ module ClusterFuck
       end
 
       def writer
-        @writer ||= ClusterFuck::Writer.new(key)
+        @writer ||= ClusterFuck::Writer.new(key, amicus_env: reader.amicus_env)
       end
 
       def reader
-        @reader ||= ClusterFuck::Reader.new(key)
+        @reader ||= ClusterFuck::Reader.new(key, amicus_env: amicus_env)
       end
 
     end

data/lib/cluster-fuck/commands/list.rb

@@ -6,6 +6,12 @@ module ClusterFuck
       include ClusterFuck::S3Methods
 
       def run_command(args, options = {})
+        @amicus_env = if args.length > 0
+                        args.first
+                      else
+                        ClusterFuck::AMICUS_ENV
+                      end
+
         $stdout.puts(all_files.join("\n"))
       end
 

data/lib/cluster-fuck/commands/override.rb

@@ -5,10 +5,12 @@ module ClusterFuck
   module Commands
     class Override
       include ClusterFuck::S3Methods
+      include AmicusEnvArgumentParser
 
       attr_reader :key
       def run_command(args, options = {})
-        @key = args.first
+        set_amicus_env_and_key_from_args(args)
+
         contents = reader.read(remote_only: true)
         FileUtils.mkdir_p(File.dirname(reader.local_override_path))
         File.open(reader.local_override_path, "w") do |f|
@@ -19,7 +21,7 @@ module ClusterFuck
 
     private
       def reader
-        @reader ||= ClusterFuck::Reader.new(key)
+        @reader ||= ClusterFuck::Reader.new(key, amicus_env: amicus_env)
       end
 
     end

data/lib/cluster-fuck/reader.rb

@@ -3,6 +3,8 @@ module ClusterFuck
     include S3Methods
 
     LOCAL_OVERRIDE_DIR = "cluster-fuck"
+    SHARED_ENV = "shared"
+
 
     attr_reader :amicus_env, :key, :version_count
     def initialize(key, opts={})
@@ -11,7 +13,16 @@ module ClusterFuck
       @ignore_local = opts[:ignore_local]
     end
 
+    def set_amicus_env_to_shared_unless_key_found!
+      unless stored_object.exists?
+        original_amicus_env = @amicus_env
+        @amicus_env = SHARED_ENV
+        raise KeyDoesNotExistError, "there was no #{key} in either #{original_amicus_env} or #{SHARED_ENV}" unless stored_object(true).exists?
+      end
+    end
+
     def read(opts = {})
+      set_amicus_env_to_shared_unless_key_found!
       yaml = data_for_key(opts)
       if yaml
         @version_count = stored_object.versions.count unless has_local_override?
@@ -36,8 +47,9 @@ module ClusterFuck
       end
     end
 
-    def stored_object
-      @stored_object ||= s3_object(key)
+    def stored_object(reload = false)
+      return @stored_object if @stored_object and !reload
+      @stored_object = s3_object(key)
     end
 
   end

data/lib/cluster-fuck/s3_methods.rb

@@ -2,6 +2,7 @@ module ClusterFuck
   module S3Methods
 
     class ConflictError < StandardError; end
+    class KeyDoesNotExistError < StandardError; end
 
     def s3_object(object_name)
       bucket.objects[full_s3_path(object_name)]
@@ -31,11 +32,8 @@ module ClusterFuck
       "#{amicus_env}/#{key}"
     end
 
-  protected
-
-
     def amicus_env
-      AMICUS_ENV
+      @amicus_env || ClusterFuck::AMICUS_ENV
     end
 
   end

data/lib/cluster-fuck/version.rb

@@ -1,3 +1,3 @@
 module ClusterFuck
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/cluster-fuck/commands/amicus_env_argument_parser_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'commander'
+require 'cluster-fuck/cli'
+
+module ClusterFuck::Commands
+  class DummyClass
+    include AmicusEnvArgumentParser
+  end
+
+  describe AmicusEnvArgumentParser do
+    subject { DummyClass.new }
+
+    it "should use the key when only one arg" do
+      subject.set_amicus_env_and_key_from_args(["test-key"])
+      subject.key.should == "test-key"
+      subject.amicus_env.should be_nil
+    end
+
+    it "should set amicus_env and key when two args" do
+      subject.set_amicus_env_and_key_from_args(["test", "test-key"])
+      subject.key.should == "test-key"
+      subject.amicus_env.should == "test"
+    end
+
+  end
+end

data/spec/lib/cluster-fuck/commands/edit_spec.rb

@@ -19,7 +19,8 @@ module ClusterFuck::Commands
     let(:mock_s3_obj) do
       mock(:s3_object, {
           read: dummy_yaml,
-          versions: mock('versions', count: 3)
+          versions: mock('versions', count: 3),
+          :exists? => true
       })
     end
 

data/spec/lib/cluster-fuck/commands/override_spec.rb

@@ -14,7 +14,7 @@ module ClusterFuck::Commands
     let(:args) { ["test-key"] }
 
     before do
-      ClusterFuck::Reader.should_receive(:new).with(args.first).and_return(mock_reader)
+      ClusterFuck::Reader.should_receive(:new).with(args.first, amicus_env: nil).and_return(mock_reader)
     end
 
     it "should read the remote contents and write the local contents" do

data/spec/lib/cluster-fuck/reader_spec.rb

@@ -6,7 +6,7 @@ module ClusterFuck
     let(:amicus_env) { 'test' }
     let(:key) { "test-key" }
     let(:reader) { Reader.new(key) }
-    let(:mock_s3_obj) { mock(:s3_object, read: nil) }
+    let(:mock_s3_obj) { mock(:s3_object, read: nil, :exists? => true) }
 
 
     it "should set amicus_env" do

data/spec/lib/cluster-fuck/s3_methods_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 module ClusterFuck
   class DummyClass
     include S3Methods
+
+    def amicus_env
+      "test"
+    end
   end
 
   describe S3Methods do

data/spec/lib/cluster-fuck/writer_spec.rb

@@ -19,7 +19,8 @@ module ClusterFuck
               even: 'here'
             }
           }),
-          versions: mock('versions', count: initial_version_count)
+          versions: mock('versions', count: initial_version_count),
+          :exists? => true
       )
       Reader.any_instance.stub(:s3_object).with("#{key}").and_return(mock_s3_obj)
       writer.stub(:s3_object).and_return(mock_s3_obj)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster-fuck
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -95,6 +95,7 @@ files:
 - cluster-fuck.gemspec
 - lib/cluster-fuck.rb
 - lib/cluster-fuck/cli.rb
+- lib/cluster-fuck/commands/amicus_env_argument_parser.rb
 - lib/cluster-fuck/commands/create.rb
 - lib/cluster-fuck/commands/edit.rb
 - lib/cluster-fuck/commands/list.rb
@@ -105,6 +106,7 @@ files:
 - lib/cluster-fuck/s3_methods.rb
 - lib/cluster-fuck/version.rb
 - lib/cluster-fuck/writer.rb
+- spec/lib/cluster-fuck/commands/amicus_env_argument_parser_spec.rb
 - spec/lib/cluster-fuck/commands/create_spec.rb
 - spec/lib/cluster-fuck/commands/edit_spec.rb
 - spec/lib/cluster-fuck/commands/override_spec.rb
@@ -140,6 +142,7 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- spec/lib/cluster-fuck/commands/amicus_env_argument_parser_spec.rb
 - spec/lib/cluster-fuck/commands/create_spec.rb
 - spec/lib/cluster-fuck/commands/edit_spec.rb
 - spec/lib/cluster-fuck/commands/override_spec.rb