kaname 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca630516a0934f809e07e87ee98b910496bfa41
-  data.tar.gz: a2b681a4c5037491c4270fdf5c859b7f39c5d6e2
+  metadata.gz: 6dd4973d77de467ed9668e6d15e86509302057bb
+  data.tar.gz: f44b64c9f188ccb3ace24c014ee1ee88db3ef9ef
 SHA512:
-  metadata.gz: 48b54645f7fdbb667ddf3d4ddbfee2d601b6d3036e15a0ef28010b5199e4f2bbcfffa38419d35db93301969cba856afbff4e452a3f10a1c2a1f273b5a84cfeed
-  data.tar.gz: 95081c6ac8c9a8c5897ca506324dbf4ab5832ac7a4f579133e8703215fda8d523b9127f19de300ce096bf6c9a21a379c16113c1d4c2edf5614644f17646b79cd
+  metadata.gz: 322e5458c83ad0d0a0be29401be176f5d3861e6d21b0a9df889bfdef1063d57bf861c3a78708a9e7de5b9603ec0172d5135517ec410b3d4e2f60bc43022ff0a3
+  data.tar.gz: 245c0a7dfbb4a3c9776420cd71c342dd529be6c4a7d23bc119cebef435fd7d2daba0b363bc7e12bd7d45c19d35d2b7c0bc4c0f1ed2fb799a66281d710bbd17bd

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in kaname.gemspec
 gemspec

data/bin/console

@@ -3,12 +3,5 @@
 require "bundler/setup"
 require "kaname"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
 require "irb"
 IRB.start

data/bin/setup

@@ -3,5 +3,3 @@ set -euo pipefail
 IFS=$'\n\t'
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/kaname.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yao", "~> 0.1.0"
+  spec.add_dependency "yao", ">= 0.2.13"
   spec.add_dependency "diffy"
   spec.add_dependency "hashdiff"
   spec.add_dependency "thor"
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-stub_any_instance"
   spec.add_development_dependency "mocha"
   spec.add_development_dependency "webmock"
 end

data/lib/kaname.rb

@@ -9,5 +9,3 @@ require 'kaname/resource'
 
 module Kaname
 end
-
-Kaname::Config.setup unless ENV['RACK_ENV'] == 'test'

data/lib/kaname/adapter.rb

@@ -1,2 +1,2 @@
-require 'kaname/adapter/real'
-require 'kaname/adapter/mock'
+require 'kaname/adapter/read_only'
+require 'kaname/adapter/read_and_write'

data/lib/kaname/adapter/{real.rb → read_and_write.rb}

@@ -3,12 +3,7 @@ require 'json'
 
 module Kaname
   module Adapter
-    class Real
-      def find_user(name)
-        user = Yao::User.find_by_name(name)
-        {"id" => user.id, "name" => user.name}
-      end
-
+    class ReadAndWrite < ReadOnly
       def create_user(name, email)
         password = Kaname::Generator.password
         puts "#{name},#{password}"

data/lib/kaname/adapter/read_only.rb

@@ -0,0 +1,79 @@
+module Kaname
+  module Adapter
+    class ReadOnly
+      def initialize
+        Kaname::Config.setup
+      end
+
+      def list_users
+        @_users ||= Yao::User.list
+      end
+
+      def find_user(name)
+        user = Yao::User.find_by_name(name)
+        {"id" => user.id, "name" => user.name}
+      end
+
+      def list_tenants
+        @_tenants ||= Yao::Tenant.list
+      end
+
+      def list_roles
+        @_roles ||= Yao::Role.list
+      end
+
+      def users_hash
+        @_user_hash ||= list_users.each_with_object(Hash.new { |h,k| h[k] = {} }) do |u,uh|
+          next if ignored_users.include?(u.name)
+          uh[u.name]["email"] = u.email
+          uh[u.name]["tenants"] = tenant_role_hash(u.name)
+        end
+      end
+
+      def create_user(name, email)
+        puts "Create User: #{name} #{email}"
+        {"name" => name}
+      end
+
+      def create_user_role(tenant, user_hash, role)
+        puts "Create User Role: #{tenant} #{user_hash["name"]} #{role}"
+      end
+
+      def delete_user(name)
+        puts "Delete User: #{name}"
+      end
+
+      def delete_user_role(tenant, user_hash, role)
+        puts "Delete User Role: #{tenant} #{user_hash["name"]} #{role}"
+      end
+
+      def change_user_role(tenant, user_hash, before_role, after_role)
+        delete_user_role(tenant, user_hash, before_role)
+        create_user_role(tenant, user_hash, after_role)
+      end
+
+      private
+
+      def tenant_role_hash(user_name)
+        list_tenants.each_with_object(Hash.new) do |t,th|
+          r = Yao::Role.list_for_user(user_name, on: t.name)
+          th[t.name] = r.first.name if r.size > 0
+        end
+      end
+
+      # default service users
+      def ignored_users
+        %w[
+          neutron
+          glance
+          cinder
+          admin
+          nova_ec2
+          nova
+          heat
+          ceilometer
+        ]
+      end
+    end
+  end
+end

data/lib/kaname/cli.rb

@@ -16,20 +16,20 @@ module Kaname
       new_password = STDIN.noecho(&:gets).strip
       puts
 
-      Kaname::Adapter::Real.new.update_user_password(old_password, new_password)
+      Kaname::Adapter::ReadAndWrite.new.update_user_password(old_password, new_password)
     end
 
     option :dryrun, type: :boolean
     desc 'apply', 'Commands about configuration apply'
     def apply
       adapter = if options[:dryrun]
-        Kaname::Adapter::Mock.new
+        Kaname::Adapter::ReadOnly.new
       else
-        Kaname::Adapter::Real.new
+        Kaname::Adapter::ReadAndWrite.new
       end
 
       if Kaname::Resource.yaml
-        diffs = HashDiff.diff(Kaname::Resource.users_hash, Kaname::Resource.yaml)
+        diffs = HashDiff.diff(adapter.users_hash, Kaname::Resource.yaml)
         diffs.each do |diff|
           resource = diff[1].split('.')
           if resource.size == 1 # "user"
@@ -62,12 +62,12 @@ module Kaname
 
     desc 'diff', 'Commands about show diffs from your openstack'
     def diff
-      puts Diffy::Diff.new(YAML.dump(Kaname::Resource.users_hash), YAML.dump(Kaname::Resource.yaml))
+      puts Diffy::Diff.new(YAML.dump(Kaname::Adapter::ReadOnly.new.users_hash), YAML.dump(Kaname::Resource.yaml))
     end
 
     desc 'dump', 'Commands about dump Keystone configuration.'
     def dump
-      puts YAML.dump(Kaname::Resource.users_hash)
+      puts YAML.dump(Kaname::Adapter::ReadOnly.new.users_hash)
     end
   end
 end

data/lib/kaname/resource.rb

@@ -10,51 +10,6 @@ module Kaname
                    nil
                  end
       end
-
-      def users
-        @_users ||= Yao::User.list
-      end
-
-      def tenants
-        @_tenants ||= Yao::Tenant.list
-      end
-
-      def roles
-        @_roles ||= Yao::Role.list
-      end
-
-      def users_hash
-        return @h if @h
-
-        @h = {}
-        users.each do |u|
-          next if ignored_users.include?(u.name)
-          @h[u.name] = {}
-          @h[u.name]["email"] = u.email
-          @h[u.name]["tenants"] = {}
-          tenants.each do |t|
-            r = Yao::Role.list_for_user(u.name, on: t.name)
-            if r.size > 0
-              @h[u.name]["tenants"][t.name] = r.first.name
-            end
-          end
-        end
-        @h
-      end
-
-      # default service users
-      def ignored_users
-        %w[
-          neutron
-          glance
-          cinder
-          admin
-          nova_ec2
-          nova
-          heat
-          ceilometer
-        ]
-      end
     end
   end
 end

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-stub_any_instance
+  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: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +171,8 @@ files:
 - kaname.gemspec
 - lib/kaname.rb
 - lib/kaname/adapter.rb
-- lib/kaname/adapter/mock.rb
-- lib/kaname/adapter/real.rb
+- lib/kaname/adapter/read_and_write.rb
+- lib/kaname/adapter/read_only.rb
 - lib/kaname/cli.rb
 - lib/kaname/config.rb
 - lib/kaname/generator.rb
@@ -184,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Identity configuration tool for OpenStack.

data/lib/kaname/adapter/mock.rb

@@ -1,31 +0,0 @@
-module Kaname
-  module Adapter
-    class Mock
-      def find_user(name)
-        {"name" => name}
-      end
-
-      def create_user(name, email)
-        puts "Create User: #{name} #{email}"
-        {"name" => name}
-      end
-
-      def create_user_role(tenant, user_hash, role)
-        puts "Create User Role: #{tenant} #{user_hash["name"]} #{role}"
-      end
-
-      def delete_user(name)
-        puts "Delete User: #{name}"
-      end
-
-      def delete_user_role(tenant, user_hash, role)
-        puts "Delete User Role: #{tenant} #{user_hash["name"]} #{role}"
-      end
-
-      def change_user_role(tenant, user_hash, before_role, after_role)
-        delete_user_role(tenant, user_hash, before_role)
-        create_user_role(tenant, user_hash, after_role)
-      end
-    end
-  end
-end