me 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304856b9ef39cde35ad5b81e881b5e6b0a96bd0c
-  data.tar.gz: b9905fe65fefbe6454414c6870a547b01a1185a6
+  metadata.gz: 898af76edd87becf6ff12a8e0e55eaa58f0fa989
+  data.tar.gz: 0ee4f2ef8512bb40af859f12483e910a694f11e3
 SHA512:
-  metadata.gz: eebb9092782e75ff680c6f3c8cf9e0f4129ba134922b30cf4b6caa32afcfcdc09a04c1dc2d12b9e0a032cf21343f01f1c5fcb3eb8f8b2e8dc9b4f5f028f7f4fe
-  data.tar.gz: 9090e74963e7d8f783847419cba4f9b355da5dc1be7f42513edb38dbfa4e6f61b20492ab07dca6f66f5108abcf42bb8aaf596a04d7eb88f293ad4a4ff0ccf4b3
+  metadata.gz: bb03aa34cb50bc149e8ea424d5ccbac528a55938699d479863eabec6c3dab7b66c078f069e775a7bbe484fa688ca80a0237ba92173859943c59ccb2ca1edc5db
+  data.tar.gz: f43288ae071d933cd9a0b36ad99fa7671d5b1b0063712866308259ef2fcd7652e888b1f42874f2e67ac660e0290314a817f72202e2bd57853db6607fbe11fdf0

data/lib/me/cli.rb

@@ -1,6 +1,7 @@
 require "thor"
 
 # common
+require "me/store"
 require "me/registry"
 require "me/executor"
 require "me/errors"

data/lib/me/identity.rb

@@ -1,6 +1,5 @@
 require "me/thread_scope"
 require "me/git_config"
-require "me/store2"
 
 module Me
   # Represents certain person, or person in certain role or situation

data/lib/me/mappers/git_config_store2.rb

@@ -1,4 +1,3 @@
-require "me/store2"
 require "me/git_config"
 require "me/errors"
 
@@ -39,15 +38,15 @@ module Me
       end
 
       def fetch_name
-        scoped.get("name")
+        scoped.fetch("name") { nil }
       end
 
       def fetch_email
-        scoped.get("email")
+        scoped.fetch("email") { nil }
       end
 
       def store
-        @_store ||= Store2.build
+        @_store ||= Store.build
       end
 
       def scoped

data/lib/me/mappers/identity_store2.rb

@@ -1,5 +1,4 @@
 require "me/identity"
-require "me/store2"
 
 module Me
   module Mappers
@@ -33,7 +32,7 @@ module Me
       end
 
       def store
-        @_store ||= Store2.build
+        @_store ||= Store.build
       end
     end
   end

data/lib/me/mappers/ssh_config_store2.rb

@@ -1,6 +1,6 @@
-require "me/store2"
 require "me/ssh_config"
 require "me/errors"
+require "me/store"
 
 module Me
   module Mappers
@@ -38,11 +38,11 @@ module Me
 
       def fetch_keys(keys)
         return keys if keys && !keys.empty?
-        scoped.get("keys")
+        scoped.fetch("keys") { nil }
       end
 
       def store
-        @_store ||= Store2.build
+        @_store ||= Store.build
       end
 
       def identity

data/lib/me/store.rb

@@ -0,0 +1,48 @@
+require "store2"
+
+module Me
+  module Store
+    class Environment < Struct.new(:value)
+      def self.wrap(env)
+        return env if env.is_a?(self)
+        new(env)
+      end
+
+      def to_s
+        "_#{value}"
+      end
+    end
+
+    class NullEnvironment < Environment
+      def to_s
+        ""
+      end
+    end
+  end
+
+  class << Store
+    def build
+      store2.build
+    end
+
+    private
+
+    def store2
+      @_store2 ||= Store2.open(filename)
+    end
+
+    def filename
+      File.join(user_home, ".me#{filename_suffix}.yml")
+    end
+
+    def user_home
+      ENV.fetch("HOME")
+    end
+
+    def filename_suffix
+      Store::Environment.wrap(
+        ENV.fetch("ME_ENV", Store::NullEnvironment.new)
+      )
+    end
+  end
+end

data/lib/me/version.rb

@@ -1,3 +1,3 @@
 module Me
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/me.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor"
+  spec.add_dependency "store2"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/me/mappers/identity_store2_spec.rb

@@ -10,7 +10,7 @@ module Me
       let(:active_identity) { "james" }
 
       before do
-        store = Store2.build
+        store = Store.build
         store.set("active_identity", active_identity)
         store.save
       end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 ENV["ME_ENV"] ||= "test"
 
+require "store2"
 require "me/thread_scope"
 
 RSpec.configure do |config|
@@ -28,8 +29,10 @@ RSpec.configure do |config|
 
   Kernel.srand config.seed
 
-  config.before do
-    Me::Store2.new._reset
+  config.around do |example|
+    Store2._with_reset do
+      example.run
+    end
   end
 
   config.after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: me
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Oleksii Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: store2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +112,7 @@ files:
 - lib/me/ssh_activation.rb
 - lib/me/ssh_config.rb
 - lib/me/ssh_config_view_model.rb
-- lib/me/store2.rb
+- lib/me/store.rb
 - lib/me/thread_scope.rb
 - lib/me/version.rb
 - lib/me/view.rb
@@ -116,7 +130,6 @@ files:
 - spec/me/mappers/identity_store2_spec.rb
 - spec/me/mappers/ssh_config_store2_spec.rb
 - spec/me/ssh_config_spec.rb
-- spec/me/store2_spec.rb
 - spec/spec_helper.rb
 - test.sh
 homepage: https://github.com/waterlink/me
@@ -139,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Small tool for switching common identities (ssh keys, git config, etc)
@@ -157,5 +170,4 @@ test_files:
 - spec/me/mappers/identity_store2_spec.rb
 - spec/me/mappers/ssh_config_store2_spec.rb
 - spec/me/ssh_config_spec.rb
-- spec/me/store2_spec.rb
 - spec/spec_helper.rb

data/lib/me/store2.rb

@@ -1,147 +0,0 @@
-require "yaml"
-
-module Me
-  class Store2
-    class Scoped
-      def initialize(store, scope)
-        @store, @scope = store, scope
-      end
-
-      def ==(other)
-        return false unless other.is_a?(Scoped)
-        [self.store, self.scope] ==
-          [other.store, other.scope]
-      end
-
-      def scoped(*add_scope)
-        Scoped.new(store, scope + add_scope)
-      end
-
-      def get(*keys)
-        store.get(scope + keys)
-      end
-
-      def set(*keys, value)
-        store.set(scope + keys, value)
-      end
-
-      def has?(*keys)
-        store.has?(scope + keys)
-      end
-
-      def get_or_set(*keys, value)
-        store.get_or_set(scope + keys, value)
-      end
-
-      def fetch(*keys, &block)
-        store.fetch(scope + keys, &block)
-      end
-
-      def save
-        store.save
-      end
-
-      def _reset
-        store._reset
-      end
-
-      protected
-
-      attr_reader :store, :scope
-    end
-
-    def initialize
-      @data = load
-    end
-
-    def self.build
-      Store2.new.scoped
-    end
-
-    def ==(other)
-      other.is_a?(Store2)
-    end
-
-    def scoped(*scope)
-      Scoped.new(self, scope)
-    end
-
-    def get(keys)
-      keys.inject(data) { |data, key| data[key] }
-    end
-
-    def set(keys, value)
-      get(keys[0...-1])[keys[-1]] = value
-    end
-
-    def has?(keys)
-      get(keys[0...-1]).has_key?(keys[-1])
-    end
-
-    def get_or_set(keys, value)
-      set(keys, value) unless has?(keys)
-      get(keys)
-    end
-
-    def fetch(keys, &block)
-      return block.call unless has?(keys)
-      get(keys)
-    end
-
-    def save
-      File.write(filename, to_yaml)
-    end
-
-    def to_yaml
-      data.to_yaml
-    end
-
-    def _reset
-      create
-    end
-
-    protected
-
-    attr_reader :data
-
-    private
-
-    def load
-      return create unless File.exist?(filename)
-      YAML.load_file(filename)
-    end
-
-    def create
-      (@data = {}).tap { save }
-    end
-
-    def filename
-      "#{user_home}/.me#{filename_suffix}.yml"
-    end
-
-    def user_home
-      ENV.fetch("HOME")
-    end
-
-    def filename_suffix
-      Environment.wrap(ENV.fetch("ME_ENV", NullEnvironment.new))
-    end
-
-    class Environment < Struct.new(:value)
-      def self.wrap(env)
-        return env if env.is_a?(self)
-        new(env)
-      end
-
-      def to_s
-        "_#{value}"
-      end
-    end
-
-    class NullEnvironment < Environment
-      def to_s
-        ""
-      end
-    end
-  end
-end

data/spec/me/store2_spec.rb

@@ -1,151 +0,0 @@
-require "me/store2"
-
-module Me
-  RSpec.describe Store2 do
-    subject(:store) { Store2.new }
-
-    describe ".build" do
-      it "creates scoped instance with empty scope" do
-        expect(Store2.build).to eq(Store2::Scoped.new(Store2.new, []))
-      end
-    end
-
-    describe "#scoped" do
-      it "creates scoped instance with specified scope" do
-        expect(store.scoped("hello", "world"))
-          .to eq(Store2::Scoped.new(Store2.new, ["hello", "world"]))
-      end
-    end
-
-    describe "#get and #set" do
-      it "gets the value given list of keys" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-        store.set(["hello", "world", "test"], "12345")
-
-        expect(store.get(["hello", "world", "test"]))
-          .to eq("12345")
-      end
-    end
-
-    describe "#has?" do
-      it "is true if key is present" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-        store.set(["hello", "world", "test"], "12345")
-
-        expect(store.has?(["hello", "world", "test"])).to eq(true)
-      end
-
-      it "is false if key is not present" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-
-        expect(store.has?(["hello", "world", "test"])).to eq(false)
-      end
-    end
-
-    describe "#get_or_set" do
-      it "is current value if it is present" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-        store.set(["hello", "world", "test"], "09876")
-
-        expect(store.get_or_set(["hello", "world", "test"], "12345")).to eq("09876")
-      end
-
-      it "is default value if it is not present" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-
-        expect(store.get_or_set(["hello", "world", "test"], "12345")).to eq("12345")
-      end
-
-      it "makes the value present if it wasn't" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-        store.get_or_set(["hello", "world", "test"], "12345")
-
-        expect(store.get(["hello", "world", "test"])).to eq("12345")
-      end
-    end
-
-    describe "#fetch" do
-      it "behaves like get if value is present" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-        store.set(["hello", "world", "test"], "09876")
-
-        expect(store.fetch(["hello", "world", "test"]) { fail }).to eq("09876")
-      end
-
-      it "calls block if value is not present" do
-        store.set(["hello"], {})
-        store.set(["hello", "world"], {})
-
-        expect { store.fetch(["hello", "world", "test"]) { fail } }
-          .to raise_error(RuntimeError)
-      end
-    end
-  end
-
-  RSpec.describe Store2::Scoped do
-    subject(:scoped) { described_class.new(store, scope) }
-
-    let(:store) { instance_double(Store2) }
-    let(:scope) { ["hello", "world", "test"] }
-
-    let(:a_value) { double("A value") }
-    let(:another_value) { double("A value") }
-    let(:a_proc) { Proc.new { a_value } }
-
-    describe "#scoped" do
-      it "creates instance of Scoped with additional scope" do
-        expect(scoped.scoped("additional", "scope"))
-          .to eq(described_class.new(store, scope + ["additional", "scope"]))
-      end
-    end
-
-    describe "#get" do
-      it "delegates to store#get" do
-        allow(store).to receive(:get).with(scope + ["some", "keys"]).and_return(a_value)
-        expect(scoped.get("some", "keys")).to eq(a_value)
-      end
-    end
-
-    describe "#set" do
-      it "delegates to store#set" do
-        expect(store).to receive(:set).with(scope + ["some", "keys"], a_value)
-        scoped.set("some", "keys", a_value)
-      end
-    end
-
-    describe "#has?" do
-      it "delegates to store#has?" do
-        allow(store).to receive(:has?).with(scope + ["some", "keys"]).and_return(a_value)
-        expect(scoped.has?("some", "keys")).to eq(a_value)
-      end
-    end
-
-    describe "#get_or_set" do
-      it "delegates to store#get_or_set" do
-        allow(store).to receive(:get_or_set).with(scope + ["some", "keys"], a_value).and_return(another_value)
-        expect(scoped.get_or_set("some", "keys", a_value)).to eq(another_value)
-      end
-    end
-
-    describe "#fetch" do
-      it "delegates to store#fetch" do
-        allow(store).to receive(:fetch).with(scope + ["some", "keys"]).and_yield
-        expect(scoped.fetch("some", "keys", &a_proc)).to eq(a_value)
-      end
-    end
-
-    describe "#save" do
-      it "delegates to store#save" do
-        expect(store).to receive(:save)
-        scoped.save
-      end
-    end
-  end
-end