envred 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93212e392b8cf3ccff6398d91037ca897c1e63e9
-  data.tar.gz: 556de3856293cdd8ad8893093f78cbfca296c5ff
+  metadata.gz: 97af96bcff96f52e3fc3e7187baf47ce0ceb7ed8
+  data.tar.gz: 2c060c0b6fddb7de2edf675af9a733f9f2d1372b
 SHA512:
-  metadata.gz: 37450b7ac0190fc8b55ee69ff7ba5cbf2c7e5ced5c56a480957fcef2c21ed9fa03f5039fead20752b30326d51c28236dc6c99d16192b1650e46a97970c41c052
-  data.tar.gz: 6a76c3fcc701975bbda8227f3a85396203c987f6ed75e20f829193de905c5079834c238456a67fb39dcc49eca4b1ac1c41667d915712f97e5f01fec0ce8e8b59
+  metadata.gz: 69ae0ee5f98509150b515b84a590d099d1aa1b0a46af7321e37228e4025a34586fbfb3500baff4255048bb21dcf38f589665d4e74af113956030a93ff616eb2d
+  data.tar.gz: a36fa4a1fb622b70adb4a659a1cd6f210f7c0ef17f0d22df6324fe39ec2847ea39176b3e56f4e6680c4fe97e2a8779200f8f870500aeeaa4928e8abd57ce194b

data/README.md

@@ -16,7 +16,7 @@ Install via rubygems:
 
 Set some variables first:
 
-    $ envred localhost:6379/0/~myapp --set FOO=1 BAR=2 BAZ=3
+    $ envred localhost:6379/0/~myapp set FOO 1 BAR 2 BAZ 3
 
 The `localhost:6379` is host anf port of Redis server, `0` is the number of
 the database to load stuff from, finally, `myapp` is the key which keeps
@@ -24,16 +24,16 @@ the data as hash.
 
 Now you can run any application with environment loaded from Redis server:
 
-    $ envred localhost:6379/0/~myapp myapp --do something
+    $ envred localhost:6379/0/~myapp wrap myapp --do something
 
 To list all your variables use:
 
-    $ envred localhost:6379/0/~myapp --list
+    $ envred localhost:6379/0/~myapp list
 
 You can remove specific keys or purge all config:
 
-    $ envred localhost:6379/0/~myapp --unset FOO BAR
-    $ envred localhost:6379/0/~myapp --purge
+    $ envred localhost:6379/0/~myapp unset FOO BAR
+    $ envred localhost:6379/0/~myapp purge
 
 ## Hacking
 

data/bin/envred

@@ -2,69 +2,105 @@
 
 require 'rubygems'
 require 'envred'
+require 'gli'
 
-$app_name = 'envred'
+include GLI::App
 
-def validate_argc(condition)
-  if condition
-    $stderr.write("ERROR: Invalid parameters. Run with `-h' flag for help.\n")
-    exit(1)
-  end
+program_desc "Environment configuration backed with Redis."
+
+desc "The URL of central env server."
+flag [:c, :central], :default_value => ENV['ENVRED_CENTRAL']
+
+pre do |globals, command, options, args|
+  $envred = Envred.new(globals[:central])
 end
 
-def safe
-  yield
-rescue => err
-  $stderr.write("ERROR: #{err.to_s}\n")
-  exit(146)
+desc "Wrap command with loaded env variables."
+long_desc "Executes given command previously setting all loaded env variables."
+command :wrap do |c|
+  c.action do |globals, options, args|
+    if args.empty?
+      help_now!('you must specify command to run')
+    end
+
+    $envred.apply do
+      exit(system(args.join(" ")))
+    end
+  end
 end
 
-case ARGV[0]
-when "-h", "--help"
-  puts "usage: #{$app_name} CENTRAL COMMAND"
-  puts "       #{$app_name} [-s|--set] CENTRAL KEY VALUE [KEY VALUE...]"
-  puts "       #{$app_name} [-u|--unset] CENTRAL KEY [KEY...]"
-  puts "       #{$app_name} [-l|--list] CENTRAL"
-  puts "       #{$app_name} [-p|--purge] CENTRAL"
-  puts "       #{$app_name} [-h|--help]"
-  exit
-when "-v", "--version"
-  puts "#{$app_name} v#{Envred::VERSION}"
-  exit
-when "-s", "--set"
-  ARGV.shift
-  validate_argc(ARGV.size < 3)
-  safe do
-    Envred::Setter.new(ARGV.shift).set(*ARGV)
-    puts "Ok!"
+desc "List variables."
+long_desc "Display list of stored variables."
+command :list do |c|
+  c.action do |globals, options, args|
+    print "Loading all variables..."
+
+    all = $envred.load
+
+    print "\r" + (" " * 40) + "\r"
+
+    if all.empty?
+      puts "No variables to show!"
+    else
+      all.each do |key, val|
+        puts "#{key}=#{val.inspect}"
+      end
+    end
   end
-when "-u", "--unset"
-  ARGV.shift
-  validate_argc(ARGV.size < 2)
-  safe do
-    Envred::Setter.new(ARGV.shift).unset(*ARGV)
+end
+
+desc "Set env variables."
+long_desc "Assigns values to one or more env variale."
+command :set do |c|
+  c.action do |globals, options, args|
+    if args.size % 2 != 0
+      help_now!("mismatched number of key-value pair arguments")
+    elsif args.size < 2
+      help_now!("you must specify at leat one key-value pair")
+    end
+
+    print "Saving variables... "
+
+    $envred.set(*args)
+
     puts "Ok!"
   end
-when "-l", "--list"
-  ARGV.shift
-  validate_argc(ARGV.size < 1)
-  safe do
-    Envred::Loader.new(ARGV.shift).each do |key, val|
-      puts "#{key}=#{val.inspect}"
+end
+
+desc "Remove variables."
+long_desc "Removes one or more env variable."
+command :unset do |c|
+  c.action do |globals, options, args|
+    if args.empty?
+      help_now!("you must specify at leat one key to remove")
     end
+
+    print "Removing variables... "
+
+    $envred.unset(*args)
+
+    puts "Ok!"
   end
-when "-p", "--purge"
-  ARGV.shift
-  validate_argc(ARGV.size < 1)
-  safe do
-    Envred::Purgator.new(ARGV.shift).purge
+end
+
+desc "Delete all variables."
+long_desc "Removes all stored variables from the project."
+command :purge do |c|
+  c.action do |globals, options, args|
+    print "Purging variables list... "
+
+    $envred.purge
+
     puts "Ok!"
   end
-else
-  validate_argc(ARGV.size < 2)
-  safe do
-    Envred::Loader.new(ARGV.shift).apply do
-      system ARGV.join(" ")
-    end
+end
+
+desc "Display current version."
+long_desc "Displays current version number."
+command :version do |c|
+  c.action do |globals, options, args|
+    puts "envred v#{Envred::VERSION}"
   end
 end
+
+exit run(ARGV)

data/envred.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 2.5"
   spec.add_development_dependency "rake"
   spec.add_dependency "redis", "~> 3.0"
+  spec.add_dependency "gli", "~> 2.9"
 end

data/lib/envred.rb

@@ -1,49 +1,37 @@
 require "envred/version"
 require "redis"
 
-module Envred
-  class Central
-    def initialize(central)
-      @server, @app = central.split("/~")
-      @redis = Redis.new(url: "redis://#{@server}")
-    end
+class Envred
+  def initialize(central)
+    @server, @app = central.split("/~")
+    @redis = Redis.new(url: "redis://#{@server}")
   end
 
-  class Loader < Central
-    def load
-      @redis.hgetall(@app)
-    end
-
-    def each(*args, &block)
-      load.each(*args, &block)
-    end
+  def load
+    @redis.hgetall(@app) or []
+  end
 
-    def apply
-      each do |key, val|
-        if val == ''
-          ENV.delete(key)
-        else
-          ENV[key] = val if ENV[key] === nil
-        end
+  def apply
+    load.each do |key, val|
+      if val == ''
+        ENV.delete(key)
+      else
+        ENV[key] = val if ENV[key] === nil
       end
-
-      yield if block_given?
     end
+
+    yield if block_given?
   end
 
-  class Setter < Central
-    def set(*values)
-      @redis.hmset(@app, *values)
-    end
+  def set(*values)
+    @redis.hmset(@app, *values)
+  end
 
-    def unset(*keys)
-      @redis.hdel(@app, *keys)
-    end
+  def unset(*keys)
+    @redis.hdel(@app, keys)
   end
 
-  class Purgator < Central
-    def purge
-      @redis.del(@app)
-    end
+  def purge
+    @redis.del(@app)
   end
 end

data/lib/envred/version.rb

@@ -1,3 +1,3 @@
-module Envred
-  VERSION = "0.1.0"
+class Envred
+  VERSION = "0.2.0"
 end

data/spec/{loader_spec.rb → envred_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path("../spec_helper.rb", __FILE__)
 
-describe Envred::Loader do
+describe Envred do
   let(:server) do
     ENV['REDIS_URL'].split('redis://').last.split('/').first
   end
@@ -18,26 +18,13 @@ describe Envred::Loader do
   end
 
   before do
+    redis.flushdb()
     redis.mapped_hmset("test", setenv)
   end
 
   describe "#load" do
     it "loads list of set variables" do
-      all = Envred::Loader.new(central).load
-      all.should have(2).items
-      all['foo'].should == '1'
-      all['bar'].should == '2'
-    end
-  end
-
-  describe "#load" do
-    it "loads list of set variables and produces an iterator for it" do
-      all = {}
-
-      Envred::Loader.new(central).each do |key, val|
-        all[key] = val
-      end
-
+      all = Envred.new(central).load
       all.should have(2).items
       all['foo'].should == '1'
       all['bar'].should == '2'
@@ -53,7 +40,7 @@ describe Envred::Loader do
     it "should load proper configuration and set env" do
       env = nil
 
-      Envred::Loader.new(central).apply do
+      Envred.new(central).apply do
         env = ENV
       end
 
@@ -64,7 +51,7 @@ describe Envred::Loader do
     it "should property pass env to commands" do
       res = nil
 
-      Envred::Loader.new(central).apply do
+      Envred.new(central).apply do
         res = `echo $foo $bar`.strip
       end
 
@@ -84,7 +71,7 @@ describe Envred::Loader do
       it "should not change existing keys" do
         res = nil
 
-        Envred::Loader.new(central).apply do
+        Envred.new(central).apply do
           res = `echo $foo $bar`.strip
         end
 
@@ -94,7 +81,7 @@ describe Envred::Loader do
       it "should remove key if value is empty" do
         res = nil
 
-        Envred::Loader.new(central).apply do
+        Envred.new(central).apply do
           res = `echo $foo $bar $baz`.strip
         end
 
@@ -103,4 +90,19 @@ describe Envred::Loader do
       end
     end
   end
+
+  describe "#set" do
+    it "should save given variable if non empty" do
+      Envred.new(central).set("foo", 1)
+      redis.hget("test", "foo").should == "1"
+    end
+  end
+
+  describe "#unset" do
+    it "should save given variable if non empty" do
+      Envred.new(central).set("foo", 1)
+      Envred.new(central).unset("foo")
+      redis.hget("test", "foo").should == nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envred
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kris Kovalik
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 description: This is a tool/wrapper for the apps that set env configuration from given
   redis machine.
 email:
@@ -84,8 +98,7 @@ files:
 - envred.gemspec
 - lib/envred.rb
 - lib/envred/version.rb
-- spec/loader_spec.rb
-- spec/setter_spec.rb
+- spec/envred_spec.rb
 - spec/spec_helper.rb
 - wercker.yml
 homepage: https://github.com/kkvlk/envred
@@ -113,6 +126,5 @@ signing_key:
 specification_version: 4
 summary: Redis backend env setup proxy.
 test_files:
-- spec/loader_spec.rb
-- spec/setter_spec.rb
+- spec/envred_spec.rb
 - spec/spec_helper.rb

data/spec/setter_spec.rb

@@ -1,34 +0,0 @@
-require File.expand_path("../spec_helper.rb", __FILE__)
-
-describe Envred::Setter do
-  let(:server) do
-    ENV['REDIS_URL'].split('redis://').last.split('/').first
-  end
-
-  let(:central) do
-    "#{server}/0/~test"
-  end
-
-  let(:redis) do
-    Redis.new(url: "redis://#{server}/0")
-  end
-
-  before do
-    redis.flushdb()
-  end
-
-  describe "#set" do
-    it "should save given variable if non empty" do
-      Envred::Setter.new(central).set("foo", 1)
-      redis.hget("test", "foo").should == "1"
-    end
-  end
-
-  describe "#unset" do
-    it "should save given variable if non empty" do
-      Envred::Setter.new(central).set("foo", 1)
-      Envred::Setter.new(central).unset("foo")
-      redis.hget("test", "foo").should == nil
-    end
-  end
-end