skalera-services 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58af74bd5695dce07aefdd1cbef432a8c00624e1
-  data.tar.gz: 73f3069de2a39e7434481fa3af35efea2c1fc698
+  metadata.gz: c758968620d43b811998ddda3e2792ef03560a70
+  data.tar.gz: 3799661c72f7b7a0bc5648f03dae68ac1ba56030
 SHA512:
-  metadata.gz: 3931ed536abb6ff2d2b6df0e62721256b85d8ab63c8d080cc6b784a60b53b54a7c08e696ece7a107596a1693acf3b8079a7a62c8b70e5a8d2e28b16acc81a822
-  data.tar.gz: 040e092cd683140363ee73a5157fa71ff5fcf77419f21bfbc2698366b739155f36452e71ddcd26d5f5575e5df47924cc68967dbd025f34d0dcdbd060467a9524
+  metadata.gz: dce29c6b934aea5ae3812ac0268de1d905daa090ca5ec525461bc49b9dd10df55b6471bc12ea9e8ee9619013fe0d1e2dd7eac0ceaa80e9e9bbed327e875f8909
+  data.tar.gz: 99cfe15a74c6dc3c3004d0c7c259dc5ca849ca30622413d53626d06ac6599d6712d13282b3d613855ceb8c151a9a0c75cf29f7a7d5b7a30ce35f0c31885cbe33

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.2.3

data/Rakefile

@@ -1 +1,38 @@
+exec('bundle', 'exec', $PROGRAM_NAME, *ARGV) unless ENV['BUNDLE_GEMFILE']
+
 require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+require 'rspec/core/rake_task'
+
+task default: [:spec, :rubocop]
+
+task spec: [:'spec:unit', :'spec:integration']
+
+def rspec_options(task)
+  # output xml if we are running through jenkins
+  return unless ENV['JENKINS_HOME']
+  opts = [
+    '--format RspecJunitFormatter',
+    "--out reports/#{task.name}.xml ",
+    '--format documentation'
+  ]
+  task.rspec_opts = opts.join(' ')
+end
+
+namespace :spec do
+  ENV['COVERAGE'] = 'yes'
+
+  desc 'run unit tests'
+  RSpec::Core::RakeTask.new(:unit) do |task|
+    rspec_options(task)
+    task.pattern = 'spec/unit/**/*_spec.rb'
+  end
+
+  desc 'run integration tests'
+  RSpec::Core::RakeTask.new(:integration) do |task|
+    rspec_options(task)
+    task.pattern = 'spec/integration/**/*_spec.rb'
+  end
+end
+
+RuboCop::RakeTask.new

data/bin/dummy.rb

@@ -14,8 +14,13 @@ Skalera::Services.bootstrap(SERVICE_NAME)
 begin
   # run your stuff here...
   influx = Skalera::Services::InfluxDB.instance('metrics')
+  puts influx
   redis = Skalera::Services::Redis.instance
+  puts redis
   DB = Skalera::Services::Postgres.instance('postgres')
+  Skalera::Services::Credentials.for('vcenter') do |host, user, password|
+    puts "#{host} / #{user} / #{password}"
+  end
 rescue => e
   STDERR.puts("#{e.class.name}: #{e.message}")
   STDERR.puts(e.backtrace)

data/lib/skalera/services.rb

@@ -1,5 +1,6 @@
 require 'skalera/services/airbrake'
 require 'skalera/services/consul'
+require 'skalera/services/credentials'
 require 'skalera/services/errbit'
 require 'skalera/services/influxdb'
 require 'skalera/services/postgres'

data/lib/skalera/services/consul.rb

@@ -14,8 +14,13 @@ module Skalera
       rescue Diplomat::KeyNotFound
         Diplomat.put("services/#{service_name}", service_name)
       rescue Faraday::ConnectionFailed => e
+        # TODO: use logging
         STDERR.puts("ERROR: could not lookup host #{consul}")
         raise e
+      rescue Faraday::ClientError => e
+        # TODO: use logging
+        STDERR.puts("ERROR: #{e}")
+        raise e
       end
     end
   end

data/lib/skalera/services/credentials.rb

@@ -0,0 +1,39 @@
+require 'diplomat'
+
+module Skalera
+  module Services
+    class Credentials
+      def self.for(service_name)
+        creds = Diplomat::Kv.get("credentials/#{service_name}", recurse: true)
+
+        users = extract(creds, service_name, 'username')
+        passwords = extract(creds, service_name, 'password')
+
+        users.map do |host, username|
+          password = passwords[host]
+          if host.nil? || username.nil? || password.nil?
+            # TODO: use logging
+            STDERR.puts "host: #{host}, username: #{username}, password: '#{password}'"
+            next
+          end
+          yield host, username, password if block_given?
+          [host, username, password]
+        end.compact # in case there is an error
+      end
+
+      def self.extract(creds, key, field)
+        result = {}
+        creds.select { |c| c[:key].match(%r{/#{field}$}) }.each do |hash|
+          host = hash[:key].match(%r{#{key}/(.+)/#{field}})[1]
+          result[host] = hash[:value]
+        end
+        result
+      end
+
+      def self.add(service_name, host, username, password)
+        Diplomat::Kv.put("credentials/#{service_name}/#{host}/username", username)
+        Diplomat::Kv.put("credentials/#{service_name}/#{host}/password", password)
+      end
+    end
+  end
+end

data/lib/skalera/services/errbit.rb

@@ -20,6 +20,7 @@ module Skalera
         Diplomat.get(key_name(service_name))
       rescue Diplomat::KeyNotFound
         key = SecureRandom.hex(8)
+        # TODO: use logging
         puts "created errbit key '#{key}' for service '#{service_name}'"
         Diplomat::Kv.put(key_name(service_name), key)
       end

data/lib/skalera/services/redis.rb

@@ -3,7 +3,7 @@ require 'redis'
 module Skalera
   module Services
     class Redis
-      def self.instance(database=0)
+      def self.instance(database = 0)
         redis_config = Diplomat::Service.get('redis')
 
         redis = ::Redis.new(url: url(password, redis_config.Address, redis_config.ServicePort, database))

data/lib/skalera/services/version.rb

@@ -1,5 +1,5 @@
 module Skalera
   module Services
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/skalera-services.gemspec

@@ -28,4 +28,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1'
   spec.add_development_dependency 'rake', '~> 10'
   spec.add_development_dependency 'pry', '~> 0'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'rubocop', '~> 0'
+  spec.add_development_dependency 'simplecov', '~> 0'
+  spec.add_development_dependency 'simplecov-json', '~> 0'
+  spec.add_development_dependency 'simplecov-rcov', '~> 0'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skalera-services
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Martin Englund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
@@ -136,6 +136,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - martin@englund.nu
@@ -159,6 +243,7 @@ files:
 - lib/skalera/services.rb
 - lib/skalera/services/airbrake.rb
 - lib/skalera/services/consul.rb
+- lib/skalera/services/credentials.rb
 - lib/skalera/services/errbit.rb
 - lib/skalera/services/influxdb.rb
 - lib/skalera/services/postgres.rb
@@ -185,9 +270,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Helper gem to handle services in consul.
 test_files: []
-has_rdoc: