kaname 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5360e90cd0487acd376fd0fda0ccd08b978baf29
-  data.tar.gz: 439eb8c715d90cbbe78c6f23fc3e77677b79b796
+  metadata.gz: 0ca630516a0934f809e07e87ee98b910496bfa41
+  data.tar.gz: a2b681a4c5037491c4270fdf5c859b7f39c5d6e2
 SHA512:
-  metadata.gz: 922b9913cceaffb329d381385298e41d8808fe62339be625993c3c46af80cc24b107872ef6e4ce837a3d4eeeebde5e9085bbae7e427bf1ffba70dbe67fff9c60
-  data.tar.gz: ffe637a4eb3e296091e67a5453253aa92da8c60112525f77923c40591cb28c1860573b63defc619b092307b8e403cb854095d5c4a246e6a879c2ab1424d1372c
+  metadata.gz: 48b54645f7fdbb667ddf3d4ddbfee2d601b6d3036e15a0ef28010b5199e4f2bbcfffa38419d35db93301969cba856afbff4e452a3f10a1c2a1f273b5a84cfeed
+  data.tar.gz: 95081c6ac8c9a8c5897ca506324dbf4ab5832ac7a4f579133e8703215fda8d523b9127f19de300ce096bf6c9a21a379c16113c1d4c2edf5614644f17646b79cd

data/README.md

@@ -1,6 +1,6 @@
 # Kaname
 
-[![Build Status](https://secure.travis-ci.org/hsbt/kaname.png)](https://travis-ci.org/hsbt/kaname)
+[![Build Status](https://secure.travis-ci.org/yaocloud/kaname.png)](https://travis-ci.org/yaocloud/kaname)
 
 Kaname(要) is configuration management tool of Keystone.
 
@@ -26,15 +26,15 @@ hsbt:
     production: "member"
 ```
 
-You need to put fog configuration to home directory.
+You need to put a configuration file to home directory.
 
 ```sh
-% cat ~/.fog
-default:
-  openstack_auth_url: "http://your-openstack-endpoint/v2.0/tokens"
-  openstack_username: "admin"
-  openstack_tenant: "admin"
-  openstack_api_key: "admin-no-password"
+% cat ~/.kaname
+auth_url: "http://your-openstack-auth-endpoint/v2.0"
+username: "admin"
+tenant: "admin"
+password: "admin-no-password"
+management_url: "http://your-openstack-management-endpoint/v2.0"
 ```
 
 run following command.
@@ -61,7 +61,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/hsbt/kaname/fork )
+1. Fork it ( https://github.com/yaocloud/kaname/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/kaname.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Identity configuration tool for OpenStack.}
   spec.description   = %q{Identity configuration tool for OpenStack. You can apply simple YAML definition into Keystone.}
-  spec.homepage      = "https://github.com/hsbt/kaname"
+  spec.homepage      = "https://github.com/yaocloud/kaname"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -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 "fog"
+  spec.add_dependency "yao", "~> 0.1.0"
   spec.add_dependency "diffy"
   spec.add_dependency "hashdiff"
   spec.add_dependency "thor"

data/lib/kaname.rb

@@ -1,5 +1,7 @@
 require "kaname/version"
 
+require 'kaname/config'
+
 require 'kaname/adapter'
 require 'kaname/cli'
 require 'kaname/generator'
@@ -7,3 +9,5 @@ require 'kaname/resource'
 
 module Kaname
 end
+
+Kaname::Config.setup unless ENV['RACK_ENV'] == 'test'

data/lib/kaname/adapter/real.rb

@@ -5,37 +5,43 @@ module Kaname
   module Adapter
     class Real
       def find_user(name)
-        user = Kaname::Resource.users.find_by_name(name)
+        user = Yao::User.find_by_name(name)
         {"id" => user.id, "name" => user.name}
       end
 
       def create_user(name, email)
         password = Kaname::Generator.password
         puts "#{name},#{password}"
-        response = Fog::Identity[:openstack].create_user(name, password, email)
-        response.data[:body]["user"]
+
+        user = Yao::User.create(name: name, email: email, password: password)
+        {"id" => user.id,  "name" => user.name}
       end
 
       def create_user_role(tenant_name, user_hash, role_name)
-        tenant = Kaname::Resource.tenants.find{|t| t.name == tenant_name}
-        role = Kaname::Resource.roles.find{|r| r.name == role_name}
-        Fog::Identity[:openstack].create_user_role(tenant.id, user_hash["id"], role.id)
+        Yao::Role.grant(role_name, to: user_hash["name"], on: tenant_name)
       end
 
-      def update_user_password(credentials, old_password, new_password)
+      def update_user_password(old_password, new_password)
+        unless Kaname::Config.management_url
+          raise 'management_url is missing. Check the configuration file.'
+        end
+
         if old_password && new_password
-          # TODO: need to confirm port number of endpoint
-          endpoint = "http://#{URI(credentials[:openstack_management_url]).hostname}:5000/v2.0"
-          url = URI.parse("#{endpoint}/OS-KSCRUD/users/#{credentials[:openstack_current_user_id]}")
+          token = Yao::Auth.try_new.token
+          me    = Yao::User.get_by_name(Kaname::Config.username)
+          endpoint = Kaname::Config.management_url
+
+          url = URI.parse("#{endpoint}/OS-KSCRUD/users/#{me.id}")
+
           req = Net::HTTP::Patch.new(url.path)
           req["Content-type"] = "application/json"
-          req["X-Auth-Token"] = credentials[:openstack_auth_token]
+          req["X-Auth-Token"] = token
           req.body = JSON.generate({'user' => {'password' => new_password, 'original_password' => old_password}})
-          res = Net::HTTP.start(url.host, url.port) {|http|
-            http.request(req)
-          }
+
+          res = Net::HTTP.start(url.host, url.port) {|http| http.request(req) }
+
           if res.code == "200"
-            puts "Your password is updated. Please update your ~/.fog configuration too."
+            puts "Your password is updated. Please update your ~/.kaname configuration too."
           else
             raise "password updating is failed"
           end
@@ -43,14 +49,11 @@ module Kaname
       end
 
       def delete_user(name)
-        user = find_user(name)
-        Fog::Identity[:openstack].delete_user(user["id"])
+        Yao::User.destroy find_user(name)["id"]
       end
 
       def delete_user_role(tenant_name, user_hash, role_name)
-        tenant = Kaname::Resource.tenants.find{|t| t.name == tenant_name}
-        role = Kaname::Resource.roles.find{|r| r.name == role_name}
-        Fog::Identity[:openstack].delete_user_role(tenant.id, user_hash["id"], role.id)
+        Yao::Role.revoke(role_name, from: user_hash["name"], on: tenant_name)
       end
 
       def change_user_role(tenant_name, user_hash, before_role_name, after_role_name)

data/lib/kaname/cli.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'fog'
 require 'thor'
 require 'hashdiff'
 require 'diffy'
@@ -8,8 +7,7 @@ module Kaname
   class CLI < Thor
     desc 'password', 'Commands about updating user password'
     def password
-      credentials = Fog::Identity[:openstack].credentials
-      puts "current_user: #{credentials[:current_user]["username"]}"
+      puts "current_user: #{Kaname::Config.username}"
 
       print "type your current password: "
       old_password = STDIN.noecho(&:gets).strip
@@ -18,7 +16,7 @@ module Kaname
       new_password = STDIN.noecho(&:gets).strip
       puts
 
-      Kaname::Adapter::Real.new.update_user_password(credentials, old_password, new_password)
+      Kaname::Adapter::Real.new.update_user_password(old_password, new_password)
     end
 
     option :dryrun, type: :boolean

data/lib/kaname/config.rb

@@ -0,0 +1,48 @@
+require 'yao'
+require 'yaml'
+
+module Kaname
+  class Config
+    def self.setup
+      load_config
+      setup_yao
+    end
+
+    def self.username
+      @@username
+    end
+
+    def self.management_url
+      @@management_url
+    end
+
+    private
+
+    def self.load_config
+      config_file = File.join(Dir.home, '.kaname')
+      raise '~/.kaname is missing' unless File.exists?(config_file)
+
+      config = YAML.load_file(config_file)
+
+      %w[auth_url tenant username password].each do |conf_item|
+        raise "Configuration '#{conf_item}' is missing. Check your ~/.kaname" unless config[conf_item]
+      end
+
+      @@auth_url       = config['auth_url']
+      @@tenant         = config['tenant']
+      @@username       = config['username']
+      @@password       = config['password']
+      @@management_url = config['management_url']
+      true
+    end
+
+    def self.setup_yao
+      Yao.configure do
+        auth_url    @@auth_url
+        tenant_name @@tenant
+        username    @@username
+        password    @@password
+      end
+    end
+  end
+end

data/lib/kaname/resource.rb

@@ -12,15 +12,15 @@ module Kaname
       end
 
       def users
-        @_users ||= Fog::Identity[:openstack].users
+        @_users ||= Yao::User.list
       end
 
       def tenants
-        @_tenants ||= Fog::Identity[:openstack].tenants
+        @_tenants ||= Yao::Tenant.list
       end
 
       def roles
-        @_roles ||= Fog::Identity[:openstack].roles
+        @_roles ||= Yao::Role.list
       end
 
       def users_hash
@@ -33,9 +33,9 @@ module Kaname
           @h[u.name]["email"] = u.email
           @h[u.name]["tenants"] = {}
           tenants.each do |t|
-            r = u.roles(t.id)
+            r = Yao::Role.list_for_user(u.name, on: t.name)
             if r.size > 0
-              @h[u.name]["tenants"][t.name] = r.first["name"]
+              @h[u.name]["tenants"][t.name] = r.first.name
             end
           end
         end

data/lib/kaname/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: yao
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -160,10 +160,11 @@ files:
 - lib/kaname/adapter/mock.rb
 - lib/kaname/adapter/real.rb
 - lib/kaname/cli.rb
+- lib/kaname/config.rb
 - lib/kaname/generator.rb
 - lib/kaname/resource.rb
 - lib/kaname/version.rb
-homepage: https://github.com/hsbt/kaname
+homepage: https://github.com/yaocloud/kaname
 licenses:
 - MIT
 metadata: {}
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Identity configuration tool for OpenStack.