miam 0.2.1 → 0.2.2.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a472cbe4cbf198885901737f30186772f19673
-  data.tar.gz: 0ec7339ac40a0cc16914c64789f33e7475d1ef41
+  metadata.gz: fe963fe6fae509bed4854e4e671692fcc18c4107
+  data.tar.gz: 231af89b949cdddf357961cdf89e80958c4d5f41
 SHA512:
-  metadata.gz: 24fa717bce2368efcc859c25d3cf0b860ae37eca5a74b8557a6d3fcea7b8285b6146e9900054e90e2ad9f4df63396a1638c41e40f528c45fb694879e5f9af989
-  data.tar.gz: dee9775236db618dadead669da2c7b022beb5436f34e60bdd755cb9a485ced042f7d90ccb15001f8271b69997f70cd8e20fca66d60ec1830a1059d20f96d3d7e
+  metadata.gz: a83c3befa251be6948f7e44de4a29905661c65a251f7eb4198894ff3e84b62438809caf75179d9f8aaa79370a824b49e3e294e7bba6bf22066a1ffb8b0b322da
+  data.tar.gz: 3c527e428ab28af26051c578c9e526573ad381669480e118e43bc06ef8fb152a004d3f84f19b3c48382e803b91a2ec98143ae0adb6587485dc3866002aee1370

data/lib/miam.rb

@@ -9,6 +9,7 @@ require 'aws-sdk-core'
 require 'ruby-progressbar'
 require 'parallel'
 require 'term/ansicolor'
+require 'diffy'
 
 module Miam; end
 require 'miam/logger'

data/lib/miam/client.rb

@@ -133,7 +133,7 @@ class Miam::Client
       @driver.delete_login_profile(user_name)
       updated = true
     elsif expected_login_profile != actual_login_profile
-      @driver.update_login_profile(user_name, expected_login_profile)
+      @driver.update_login_profile(user_name, expected_login_profile, actual_login_profile)
       updated = true
     end
 
@@ -257,7 +257,7 @@ class Miam::Client
     updated = false
 
     if expected_assume_role_policy != actual_assume_role_policy
-      @driver.update_assume_role_policy(role_name, expected_assume_role_policy)
+      @driver.update_assume_role_policy(role_name, expected_assume_role_policy, actual_assume_role_policy)
       updated = true
     end
 
@@ -367,7 +367,7 @@ class Miam::Client
     updated = false
 
     if expected_path != actual_path
-      @driver.update_path(type, user_or_group_name, expected_path)
+      @driver.update_path(type, user_or_group_name, expected_path, actual_path)
       updated = true
     end
 
@@ -400,7 +400,7 @@ class Miam::Client
     updated = false
 
     if expected_document != actual_document
-      @driver.update_policy(type, user_or_group_name, policy_name, expected_document)
+      @driver.update_policy(type, user_or_group_name, policy_name, expected_document, actual_document)
       updated = true
     end
 

data/lib/miam/driver.rb

@@ -91,12 +91,12 @@ class Miam::Driver
     end
   end
 
-  def update_login_profile(user_name, attrs)
+  def update_login_profile(user_name, attrs, old_attrs)
     log_attrs = attrs.dup
     log_attrs.delete(:password)
 
     log(:info, "Update User `#{user_name}`", :color => :green)
-    log(:info, "  update login profile: #{log_attrs.inspect}", :color => :green)
+    log(:info, "  login profile:\n".green + Miam::Utils.diff(old_attrs, attrs, :color => @options[:color], :indent => '    '), :color => false)
 
     unless_dry_run do
       @iam.update_login_profile(attrs.merge(:user_name => user_name))
@@ -226,9 +226,9 @@ class Miam::Driver
     end
   end
 
-  def update_assume_role_policy(role_name, policy_document)
+  def update_assume_role_policy(role_name, policy_document, old_policy_document)
     log(:info, "Update Role `#{role_name}` > AssumeRolePolicy", :color => :green)
-    log(:info, "  #{policy_document.pretty_inspect.gsub("\n", "\n  ").strip}", :color => :green)
+    log(:info, Miam::Utils.diff(old_policy_document, policy_document, :color => @options[:color]), :color => false)
 
     unless_dry_run do
       @iam.update_assume_role_policy(
@@ -266,13 +266,13 @@ class Miam::Driver
 
   def update_name(type, user_or_group_name, new_name)
     log(:info, "Update #{Miam::Utils.camelize(type.to_s)} `#{user_or_group_name}`", :color => :green)
-    log(:info, "  set name=#{new_name}", :color => :green)
+    log(:info, "  name:\n".green + Miam::Utils.diff(user_or_group_name, new_name, :color => @options[:color], :indent => '    '), :color => false)
     update_user_or_group(type, user_or_group_name, "new_#{type}_name".to_sym => new_name)
   end
 
-  def update_path(type, user_or_group_name, new_path)
+  def update_path(type, user_or_group_name, new_path, old_path)
     log(:info, "Update #{Miam::Utils.camelize(type.to_s)} `#{user_or_group_name}`", :color => :green)
-    log(:info, "  set path=#{new_path}", :color => :green)
+    log(:info, "  path:\n".green + Miam::Utils.diff(old_path, new_path, :color => @options[:color], :indent => '    '), :color => false)
     update_user_or_group(type, user_or_group_name, :new_path => new_path)
   end
 
@@ -289,9 +289,9 @@ class Miam::Driver
     put_policy(type, user_or_group_name, policy_name, policy_document)
   end
 
-  def update_policy(type, user_or_group_name, policy_name, policy_document)
+  def update_policy(type, user_or_group_name, policy_name, policy_document, old_policy_document)
     log(:info, "Update #{Miam::Utils.camelize(type.to_s)} `#{user_or_group_name}` > Policy `#{policy_name}`", :color => :green)
-    log(:info, "  #{policy_document.pretty_inspect.gsub("\n", "\n  ").strip}", :color => :green)
+    log(:info, Miam::Utils.diff(old_policy_document, policy_document, :color => @options[:color]), :color => false)
     put_policy(type, user_or_group_name, policy_name, policy_document)
   end
 

data/lib/miam/utils.rb

@@ -15,5 +15,17 @@ class Miam::Utils
         str.length
       end
     end
-  end
+
+    def diff(obj1, obj2, options = {})
+      diffy = Diffy::Diff.new(
+        obj1.pretty_inspect,
+        obj2.pretty_inspect,
+        :diff => '-u'
+      )
+
+      out = diffy.to_s(options[:color] ? :color : :text).gsub(/\s+\z/m, '')
+      out.gsub!(/^/, options[:indent]) if options[:indent]
+      out
+    end
+  end # of class methods
 end

data/lib/miam/version.rb

@@ -1,3 +1,3 @@
 module Miam
-  VERSION = '0.2.1'
+  VERSION = '0.2.2.beta'
 end

data/miam.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby-progressbar'
   spec.add_dependency 'parallel'
   spec.add_dependency 'term-ansicolor'
+  spec.add_dependency 'diffy'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miam
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -190,12 +204,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Miam is a tool to manage IAM.