miam 0.2.0.beta2 → 0.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4746d43e2426cfba92bc734aefcb601afaca48
-  data.tar.gz: 97b169346e842f94b37dff744b8fd6bf8056a759
+  metadata.gz: 02ea3a9eccf5a34002ed0775537a780f4084bdb4
+  data.tar.gz: 12e7a9bb92969303b5655486a404d74247bfda51
 SHA512:
-  metadata.gz: 295c3b5fdc15a5d900e95414fb1d59daf7b3c07fd755ff1413ab64eed6027bf9b3a457dc03e31bd7f405ff747117811b2d1831fedbf08988cd2980aa702ae63a
-  data.tar.gz: e78da7de7c8bd646bb2558a0787fa7d20a048deea465b6beb3e772aef95d19eb5459380ee8962f9f25abdffbe57abd735d9fe327baa812c53e826eab27b2122d
+  metadata.gz: ba2d9553831f37ebb328b76cddfab99ba150772bfddb9ac3f52922ab448a5be4cd2b7e97b123d1aa83013319746f8855793c222802d387d75a5f7e31f5db9415
+  data.tar.gz: fc93bbd87a16930836fa06d94c0b04157325e6fa0da3a7a083d9efd75f356b11c89ede4dff1512585f6f2ee095fc7fe733d61b026f186155c94ae957f88d5f02

data/README.md

@@ -12,7 +12,6 @@ It defines the state of IAM using DSL, and updates IAM according to DSL.
 
 * `>= 0.2.0`
   * Use [get_account_authorization_details](http://docs.aws.amazon.com/sdkforruby/api/Aws/IAM/Client.html#get_account_authorization_details-instance_method).
-  * Remove progress bar.
 
 ## Installation
 
@@ -62,6 +61,7 @@ Usage: miam [options]
         --export-concurrency N
         --target REGEXP
         --no-color
+        --no-progress
         --debug
 ```
 

data/bin/miam

@@ -46,6 +46,7 @@ ARGV.options do |opt|
     opt.on(''  , '--export-concurrency N', Integer) {|v| options[:export_concurrency] = v                                     }
     opt.on(''  , '--target REGEXP')                 {|v| options[:target]             = Regexp.new(v)                         }
     opt.on(''  , '--no-color')                      {    options[:color]              = false                                 }
+    opt.on(''  , '--no-progress')                   {    options[:no_progress]        = true                                  }
     opt.on(''  , '--debug')                         {    options[:debug]              = true                                  }
     opt.parse!
 

data/lib/miam.rb

@@ -6,6 +6,7 @@ require 'singleton'
 require 'thread'
 
 require 'aws-sdk-core'
+require 'ruby-progressbar'
 require 'parallel'
 require 'term/ansicolor'
 

data/lib/miam/exporter.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 class Miam::Exporter
   def self.export(iam, options = {})
     self.new(iam, options).export
@@ -20,6 +21,17 @@ class Miam::Exporter
     group_users = {}
     instance_profile_roles = {}
 
+    unless @options[:no_progress]
+      progress_total = users.length + groups.length + roles.length + instance_profiles.length
+
+      @progressbar = ProgressBar.create(
+                       :format => ' %bᗧ%i %p%%',
+                       :progress_mark  => ' ',
+                       :remainder_mark => '･',
+                       :total => progress_total,
+                       :output => $stderr)
+    end
+
     expected = {
       :users => export_users(users, group_users),
       :groups => export_groups(groups),
@@ -56,6 +68,8 @@ class Miam::Exporter
         if login_profile
           result[user_name][:login_profile] = login_profile
         end
+
+        progress
       end
     end
 
@@ -94,6 +108,8 @@ class Miam::Exporter
           :path => group.path,
           :policies => policies,
         }
+
+        progress
       end
     end
 
@@ -133,6 +149,8 @@ class Miam::Exporter
           :instance_profiles => instance_profiles,
           :policies => policies,
         }
+
+        progress
       end
     end
 
@@ -160,6 +178,8 @@ class Miam::Exporter
         result[instance_profile_name] = {
           :path => instance_profile.path,
         }
+
+        progress
       end
     end
 
@@ -175,6 +195,10 @@ class Miam::Exporter
   def get_account_authorization_details
     account_authorization_details = {}
 
+    unless @options[:no_progress]
+      progressbar = ProgressBar.create(:title => 'Loading', :total => nil, :output => $stderr)
+    end
+
     keys = [
       :user_detail_list,
       :group_detail_list,
@@ -188,9 +212,17 @@ class Miam::Exporter
     @iam.get_account_authorization_details.each do |resp|
       keys.each do |key|
         account_authorization_details[key].concat(resp[key])
+
+        unless @options[:no_progress]
+          progressbar.increment
+        end
       end
     end
 
     account_authorization_details
   end
+
+  def progress
+    @progressbar.increment if @progressbar
+  end
 end

data/lib/miam/ext/aws_ext.rb

@@ -19,7 +19,7 @@ module Seahorse
       private
 
       def add_GetAccountAuthorizationDetails_paginator(json)
-        json["GetAccountAuthorizationDetails"] = {
+        json["pagination"]["GetAccountAuthorizationDetails"] = {
           "input_token" => "Marker",
           "output_token" => "Marker",
           "more_results" => "IsTruncated",

data/lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.2.0.beta2'
+  VERSION = '0.2.0.beta3'
 end

data/miam.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk-core', '~> 2.0.3'
+  spec.add_dependency 'ruby-progressbar'
   spec.add_dependency 'parallel'
   spec.add_dependency 'term-ansicolor'
   spec.add_development_dependency 'bundler', '~> 1.7'

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ end
 def client(user_options = {})
   options = {
     logger: Logger.new('/dev/null'),
+    no_progress: true
   }
 
   options[:password_manager] = Miam::PasswordManager.new('/dev/null', options)
@@ -75,7 +76,7 @@ def apply(cli = client)
 end
 
 def export(options = {})
-  options = {}.merge(options)
+  options = {no_progress: true}.merge(options)
   cli = options.delete(:client) || Aws::IAM::Client.new
   Miam::Exporter.export(cli, options)[0]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta2
+  version: 0.2.0.beta3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  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: parallel
   requirement: !ruby/object:Gem::Requirement