elasticDynamoDb 1.2.1 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWQwZjUzN2JhMTZhNTljNTE3YWZmZDJhZGM5MzA4NDUyMTJmMTA0Yw==
-  data.tar.gz: !binary |-
-    ZWI3OGEyNGQyNTY4NTJkMzU3M2YxNDA4ZTU0NDgwYzU3ZDczY2IyYw==
+SHA1:
+  metadata.gz: 1bff72ed568398542c09761c32d3150a52f4cb15
+  data.tar.gz: 107bf653d4a6e1e6b7d3e2bd7d5af4212f795d3a
 SHA512:
-  metadata.gz: !binary |-
-    ZmQ2YzgxYTM1ZDAyZDNkNmVjZDg0ZDg3MTJhNmVhYzUyOGY1ZjQyZGY2NjY5
-    ZTdmMDE2MDQyNWViNjIwNGVlZjUzMjBkY2QxY2ZiZmFlNmJkNmIwY2Q1MmZm
-    MzhiMmVmZjA1NmUzOTAyMjE5NGVlMDQwODdmNzk4ODgwMGI2OTE=
-  data.tar.gz: !binary |-
-    NGZiNWY1NWJmNjk2ODgwZDJjYjk1YWJkYzU4ZDU0MjhmNzY3YjRhZmQwODI1
-    OGEyYzFhZDk4NDlkODE1Y2I5NjJlYzZhNTg3Yjc0NTNiOGJhOGNiNzFlMjM0
-    MDkxZmViODFjODM3M2JjNTk5OTEwZWUxYWIyMTgwYWU0MGM0ZGE=
+  metadata.gz: 966408d598308dceb8ed0bd75f38b8841249a1b04cecd46539b78cc8191b23622ff2e10dd52735d75bfd3d433834d657e3d29fe28a3c15ecdf29ef4e1a55b1cd
+  data.tar.gz: 4a51b001649f9e23eafd72556ad5b75b03306d65a5c0e5a89bf6367e8600fa542676a0923ecee2f1bc278c69420a6f781e2235a7db0e5dd34087b7ec285b0950

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+*.gem
+*.conf

data/CHANGES.md

@@ -0,0 +1,6 @@
+1.3.0
+-----
+
+* changed aws-sdk to v2 (aws-sdk-core)
+* add local dynamodb support for testing
+* refactor cli to its own module

data/README.md

@@ -4,12 +4,10 @@
 
 [dynamic-dynamodb](https://github.com/sebdah/dynamic-dynamodb) tool is great for autoscaling but it has a few limitation:
 
-* it does not scale down at once to certian value
+* it does not scale down at once to a certain value
 
 * it does not accomodate for anticipated traffic spike that can last X hours
 
-* it does not scale down to a value at once
-
 
 ElasticDynamoDb is intended to extend the functionality of dynamic-dynamodb, allowing you to scale by a factor (up/down) and elastically return to the original values it had before
 

data/bin/elasticDynamoDb

@@ -1,314 +1,21 @@
 #!/usr/bin/env ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))
 require 'thor'
-require 'aws-sdk'
-require 'fileutils'
+require 'elasticDynamoDb'
 
-require_relative '../lib/configparser'
-
-class ElasticDynamoDb < Thor
-  default_task :show_help
-  include Thor::Actions
-
-  desc "onDemand", "Ease autoscale by schedule or scale factor"
-  method_option :factor, :required => true,  :alias => 'f', :type => :numeric, :banner => 'scale factor can be decimal too 0.5 for instance'
-  method_option :schedule_restore, :alias => 's', :type => :numeric, :banner => 'number of minutes for ElasticDynamoDb to restore original values', :default => 0
-  method_option :working_dir, :default => '~', :alias => 'd', :banner => 'location for backup config and change log [default home dir for the user]'
-  method_option :config_file, :required => true, :alias => 'c', :banner => 'location of dynamic-dynamodb.conf'
-  method_option :stop_cmd, :banner => 'bash stop command for dynamic-dynamodb service' 
-  method_option :start_cmd, :banner => 'bash start command for dynamic-dynamodb service' 
-  def onDemand
-    @@config_file = options[:config_file]
-    @@in_restore  = false
-    @@timestamp   = Time.now.strftime("%m%d%Y-%H%M%S")
-
-    @@working_dir = options[:working_dir]
-    @@bkp_folder  = "#{File.expand_path(@@working_dir)}/ElasticDynamoDb/dynamodb_config_backups"
-    @@log_file    = "#{File.expand_path(@@working_dir)}/ElasticDynamoDb/change.log" 
-    config_file_name = File.basename(@@config_file)
-    @@original_config_file = "#{@@bkp_folder}/#{config_file_name}-#{@@timestamp}"
-
-    FileUtils.mkdir_p "#{File.expand_path(@@working_dir)}/ElasticDynamoDb/dynamodb_config_backups"
-
-    process_config(@@config_file, options[:factor])    
-    
-    if options[:schedule_restore] > 0 && !@@in_restore
-      say("#{Time.now} - Waiting here for #{options[:schedule_restore]} minutes until restore")
-      sleep options[:schedule_restore] * 60
-      @@in_restore = true
-      say "#{Time.now} - Restoring to original config file (#{@@original_config_file}))"
-      process_config(@@original_config_file, 1)
-    end
-      
-    say("All done! you may restart the dynamic-dynamodb process")
-  end
-
-  desc 'show_help', 'Display Usage'
-  def show_help
-    help_block = <<-HELP
-Elastic DynamoDb - an OnDemand tool to help with auto scaling of dynamic-dynamodb
-Synopsis:
-  dynamic-dynamodb tool is great for autoscaling, however it does not scale down at once to certian value
-  and it does not accomodate for anticipated traffic spike that can last X hours
-
-  This tool is intended to extend the functionality of dynamic-dynamodb, allowing you to scale by a factor (up/down) and elastically return to the original values it had before
-
-  it possible to automate the start and stop of the service by passing a bash command to the --start_cmd / --stop_cmd
-
-Usage:
-  elasticDynamoDb onDemand --config-file=location of dynamic-dynamodb.conf --factor=Scale factor (can be decimal too, i.e: 0.5) --schedule-restore 120
-
-Options:
-  --config-file=location of dynamic-dynamodb.conf
-  --factor scale factor can be decimal too 0.5 for instance
-  [--schedule-restore=number of minutes for ElasticDynamoDb to restore original values] # Default: 0 (No restore)
-  [--working-dir=location for backup config and change log [default home user dir]]
-  [--stop-cmd=bash stop command for dynamic-dynamodb service (must be wrapped in quotes)]
-  [--start-cmd=bash start command for dynamic-dynamodb service (must be wrapped in quotes)]
-  HELP
-  say(help_block)
-  end
-
-private
-  def process_config(file, factor)
-    read_config(file)
-    scale(factor)
-    write_config(factor)
-    begin
-      system(options[:stop_cmd]) if options[:stop_cmd]
-    rescue Exception => e
-      puts "error trying the stop command: #{e}"
-    end
-    update_aws_api
-  end
-
-  def read_config(config_file)
-    @@config = ConfigParser.new(config_file).parse
-  end
-
-  def scale(factor=nil)
-    if !factor.nil?
-      scale_factor = factor
-
-      active_throughputs = @@config.keys.select{|k| k =~ /table/}
-      
-      active_throughputs.each do |prefix|
-        min_reads  = @@config[prefix]['min-provisioned-reads'].to_i
-        min_writes = @@config[prefix]['min-provisioned-writes'].to_i
-
-        say("(scale factor: #{scale_factor}) Global Secondary Index / Table: #{prefix.gsub('$','').gsub('^', '')} =>", color=:cyan)
-        puts "Current min-read from #{@@config_file}: #{min_reads}"
-        puts "Current min-write from #{@@config_file}: #{min_writes}"
-
-        @@config[prefix]['min-provisioned-reads'] = (min_reads * scale_factor).to_i
-        @@config[prefix]['min-provisioned-writes'] = (min_writes * scale_factor).to_i
-
-        say("New min reads: #{@@config[prefix]['min-provisioned-reads']}", color=:yellow)
-        say("New min writes: #{@@config[prefix]['min-provisioned-writes']}", color=:yellow)
-        puts "------------------------------------------------"
-      end
-    else
-      say("Need a factor to scale by,(i.e scale --factor 2)", color=:green)
-      exit
-    end
-  end
-
-  def write_config(scale_factor)
-    if options[:schedule_restore] > 0 
-      restore = "auto restore to bakcup config file (#{@@original_config_file}) in #{options[:schedule_restore]} minutes"
-    else
-      restore = "Backup to #{@@original_config_file}"
-    end
-
-    if @@in_restore
-      confirmed = true
-    else
-      confirmed = yes?("OverWrite the new config file (#{restore})? (yes/no)", color=:red)
-    end
-
-    if confirmed
-      backup
-      
-      str_to_write = ''
-      @@config.each do |section, lines|
-        if !section.include?('pre_section')
-          str_to_write += "[#{section}]\n"
-        end
-
-        lines.each do |line, value|
-          if value =~ /^(#|;|\n)/
-            str_to_write += "#{value}"
-          else
-            str_to_write += "#{line}: #{value}\n"
-          end
-        end
-      end
-      
-      save_file(str_to_write)
-
-      if !@@in_restore
-        reason = ask('type the reason for the change: ', color=:magenta)
-      else
-        reason = 'Auto restore to @@original_config_file'
-      end
-      
-      log_changes("#{reason} - Changed throughputs by factor of: #{scale_factor}")
-      
-      say("new config changes commited to file")
-    else
-      say("Not doing antything - Goodbye...", color=:green)
-      exit
-    end  
-  end
-
-  def log_changes(msg)
-    say("Recording change in #{@@log_file}")
-
-    File.open(@@log_file, 'a') do |file|
-      file.write "#{Time.now} - #{msg}\n"
-    end
-  end
-
-  def backup
-    `mkdir -p #{@@bkp_folder} && cp #{@@config_file} #{@@original_config_file}` if @@config_file
-    say "backup file created: #{@@original_config_file}"
-  end
-
-  def save_file(str)
-    File.open(@@config_file, 'w') do |file|
-      file.write str
-    end
-  end
-
-  def update_aws_api
-    if @@in_restore
-      confirmed = true
-    else
-      confirmed = yes?('Update all tables with these values on DynamoDb? (yes/no)', color=:red)
-    end
-
-    if confirmed
-      AWS.config({
-        :access_key_id => @@config['global']['aws-access-key-id'],
-        :secret_access_key => @@config['global']['aws-secret-access-key-id'],
-        :region => @@config['global']['region'],
-      })
-
-      @@ddb = AWS::DynamoDB::Client.new(:api_version => '2012-08-10')
-
-      provisioning ={}
-
-      active_throughputs = @@config.keys.select{|k| k =~ /table/}
-
-      active_throughputs.inject(provisioning) { |acc, config_section|
-        config_section =~ /^(gsi:\ *\^(?<index>.*)\$|)\ *table:\ *\^(?<table>.*)\$/
-        index = $1
-        table = $2
-        
-        if config_section.include?('gsi')
-          acc[table] ||= {}
-          acc[table][index] ||= {}
-          acc[table][index]['reads']  = @@config[config_section]['min-provisioned-reads'].to_i
-          acc[table][index]['writes'] = @@config[config_section]['min-provisioned-writes'].to_i
-        else
-          acc[table] ||= {}
-          acc[table]['reads']  = @@config[config_section]['min-provisioned-reads'].to_i
-          acc[table]['writes'] = @@config[config_section]['min-provisioned-writes'].to_i
-        end
-        acc  
-      }
-      log_changes("Update AWS via api call with the following data:\n #{provisioning}\n")
-      update_tables(provisioning)
-    else
-      if @@in_restore
-        confirmed = true
-      end
-
-      if options[:start_cmd]
-        confirmed = yes?("send the start command #{options[:start_cmd]} ? (yes/no)")
-      end
-
-      if confirmed
-        begin
-          system(options[:start_cmd]) if options[:start_cmd]
-        rescue Exception => e
-          puts "error trying the start command: #{e}"
-        end
-      end
-      exit
-    end
-  end
-
-  def check_status(table_name)   
-    until table_status(table_name) == 'ACTIVE' && !indexes_status(table_name).any? {|i| i != 'ACTIVE'}
-      say("#{table_name} is not ACTIVE => sleeping for 30 sec and will retry again", color=:yellow)
-      sleep 30
-    end
-    return true
-  end
-
-  def table_status(table_name)
-    print "Checking table #{table_name} status..."
-    status = @@ddb.describe_table({:table_name => table_name}).table.table_status 
-    puts status
-    status
-  end
-
-  def indexes_status(table_name)
-    print "Checking indexes status on #{table_name}..."
-    indexes_status = []
-    if @@ddb.describe_table({:table_name => table_name}).table.keys.include?(:global_secondary_indexes)
-       @@ddb.describe_table({:table_name => table_name}).table.global_secondary_indexes.each {|i| indexes_status << i.index_status }
-    end
-
-    if indexes_status.empty?
-      puts "No indexes for #{table_name} table"
-    else 
-      puts indexes_status
-    end
-    indexes_status
-  end
-
-  def update_tables(provisioning)
-    provisioning.each do |table, values|
-      options = {
-                  :table_name => table,
-                  :provisioned_throughput => {
-                                              :read_capacity_units =>  values['reads'],
-                                              :write_capacity_units =>  values['writes']
-                  }
-      }
-      
-      # if one of the keys for the table contain index merge the options for update table
-      indexes = provisioning[table].keys.select { |key| key.match(/index/) }
-      if !indexes.empty?
-        indexes.each do |index|
-          options.merge!({ 
-                         :global_secondary_index_updates => [{:update => { 
-                                                                            :index_name => index,
-                                                                            :provisioned_throughput => {
-                                                                              :read_capacity_units =>  values[index]['reads'],
-                                                                              :write_capacity_units => values[index]['writes'] 
-                                                                            }
-                                                                          }
-                                                              }]
-          })
-        end
-      end
+def help
+	ElasticDynamoDb::Cli.help(Thor::Base.shell.new) 
+end
 
-      ready = check_status(table)
-      
-      begin
-        say("Updating provisioning for table: #{table}",color=:cyan)
-        @@ddb.update_table(options) if ready 
-      rescue Exception => e
-        if e.to_s.include?('must be at most 100 percent of current value')
-          say("No Change - Scale up is higher then 100% of the original values, restrating dynamic-dynamodb process will auto scale up to the new values", color=:yellow)
-        else
-          say("unable to update table: #{e}", color=:red)
-        end
-      end  
-    end
-  end
+begin
+  ENV["THOR_DEBUG"] = "1" 
+  ElasticDynamoDb::Cli.start
+rescue Thor::RequiredArgumentMissingError => e
+  puts "\e[31mMissing Arguments: #{e}\e[0m\n\n"
+  help
+rescue Thor::InvocationError => e
+	puts "\e[31m#{e.to_s.gsub(/Usage:.+"/, '').chomp} but there's no such option\e[0m\n\n"
+	help
 end
 
-ElasticDynamoDb.start
+

data/elasticDynamoDb.gemspec

@@ -0,0 +1,20 @@
+$:.push File.expand_path("../lib", __FILE__)
+require File.expand_path('../lib/elasticDynamoDb', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "elasticDynamoDb"
+  s.version     = ElasticDynamoDb::VERSION
+  s.authors     = ["Ami Mahloof"]
+  s.email       = "ami.mahloof@gmail.com"
+  s.homepage    = "https://github.com/innovia/ElasticDynamoDb"
+  s.summary     = "scale dynamodb by factor with dynamic-dynamodb"
+  s.description = "Elastically scale up or down with dynamic-dynamodb tool"
+  s.required_rubygems_version = ">= 1.3.6"
+  s.files = `git ls-files`.split($\).reject{|n| n =~ %r[png|gif\z]}.reject{|n| n =~ %r[^(test|spec|features)/]}
+  s.add_runtime_dependency 'configparser', '~> 0'
+  s.add_runtime_dependency 'thor', '~> 0.19', '>= 0.19.1'
+  s.add_runtime_dependency 'aws-sdk-core', '~> 2.0.17', '>= 2.0.17'
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.license = 'MIT'
+end

data/lib/elasticDynamoDb/cli.rb

@@ -0,0 +1,357 @@
+#!/usr/bin/env ruby
+require 'thor'
+require 'aws-sdk-core'
+require 'fileutils'
+
+autoload :ConfigParser, 'elasticDynamoDb/configparser'
+
+class ElasticDynamoDb::Cli < Thor
+  include Thor::Actions
+  default_task  :onDemand
+  attr_accessor :restore_in_progress, :backup_folder, :config_file_name, :original_config_file, :config, :ddb,
+                :log_file
+
+  desc "onDemand", "Ease autoscale by schedule or scale factor"
+  class_option :factor,            :type => :numeric,                         :banner => 'scale factor can be decimal too 0.5 for instance'
+  class_option :config_file,                                                  :banner => 'location of dynamic-dynamodb.conf'
+  class_option :working_dir,       :default => '~',                           :banner => 'location for backup config and change log [default home dir for the user]'
+  class_option :stop_cmd,                                                     :banner => 'bash stop command for dynamic-dynamodb service' 
+  class_option :start_cmd,                                                    :banner => 'bash start command for dynamic-dynamodb service'
+  class_option :schedule_restore,  :type => :numeric, :default => 0,          :banner => 'number of minutes for ElasticDynamoDb to restore original values'
+  class_option :timestamp,         :default => Time.now.utc.strftime("%m%d%Y-%H%M%S")
+  class_option :local,             :type => :boolean, :default => false,      :desc => 'run on DynamoDBLocal'
+  def onDemand
+    raise Thor::RequiredArgumentMissingError, 'You must supply a scale factor' if options[:factor].nil?
+    raise Thor::RequiredArgumentMissingError, 'You must supply the path to the dynamic-dyanmodb config file' if options[:config_file].nil?
+    init
+    aws_init
+
+    process_config(options[:config_file], options[:factor])    
+    
+    if options[:schedule_restore] > 0 && !restore_in_progress
+      say("#{Time.now} - Waiting here for #{options[:schedule_restore]} minutes until restore")
+      sleep options[:schedule_restore] * 60
+      
+      self.restore_in_progress = true
+      say "#{Time.now} - Restoring to original config file (#{self.original_config_file})"
+      process_config(self.original_config_file, 1)
+    end
+    
+    unless options[:start_cmd] || options[:stop_cmd]  
+      say "All done! you may restart the dynamic-dynamodb process manually", color = :white
+    end
+  end
+
+  map ["-v", "--version"] => :version
+  desc "version", "version"
+  def version
+    say ElasticDynamoDb::ABOUT
+  end
+
+private
+  def init
+    working_dir = File.expand_path(options[:working_dir])
+    self.config_file_name = File.basename(options[:config_file])
+    read_config(File.expand_path(options[:config_file]))
+
+    self.restore_in_progress = false
+
+    self.backup_folder  = "#{working_dir}/ElasticDynamoDb/dynamodb_config_backups"
+    self.log_file    = "#{working_dir}/ElasticDynamoDb/change.log" 
+
+    self.original_config_file = "#{self.backup_folder}/#{self.config_file_name}-#{options[:timestamp]}"
+
+    FileUtils.mkdir_p self.backup_folder
+  end
+
+  def aws_init
+    if options[:local]
+      ENV['AWS_REGION'] = 'us-east-1'
+      say "using local DynamoDB"
+      self.ddb = Aws::DynamoDB::Client.new({endpoint: 'http://localhost:4567', api: '2012-08-10'})
+    else
+      credentials = Aws::Credentials.new(
+        self.config['global']['aws-access-key-id'], self.config['global']['aws-secret-access-key-id']
+      )
+
+      self.ddb = Aws::DynamoDB::Client.new({
+        api: '2012-08-10', 
+        region: self.config['global']['region'],
+        credentials: credentials
+      })  
+    end
+  end
+
+  def process_config(file, factor)
+    read_config(file)
+    scale(factor)
+    write_config(factor)
+        
+    process_ctrl('Stopping', options[:stop_cmd])
+    
+    update_aws_api
+    
+    process_ctrl('Starting', options[:start_cmd])
+  end
+
+  def process_ctrl(desc, action)
+    begin
+      if action
+        say "#{desc} dynamic-dynamodb process using the command #{action}", color = :cyan
+        system(action)
+      end 
+    rescue Exception => e
+      say "Error: fail to run the command: #{e}", color = :red
+    end  
+  end
+
+  def read_config(config_file)
+    self.config = ConfigParser.new(config_file).parse
+  end
+
+  def scale(factor=nil)
+    if !factor.nil?
+      scale_factor = factor
+
+      active_throughputs = self.config.keys.select{|k| k =~ /table/}
+      
+      active_throughputs.each do |prefix|
+        min_reads  = self.config[prefix]['min-provisioned-reads'].to_i
+        min_writes = self.config[prefix]['min-provisioned-writes'].to_i
+
+        say("(scale factor: #{scale_factor}) Global Secondary Index / Table: #{prefix.gsub('$','').gsub('^', '')} =>", color=:cyan)
+        say("Current min-read from #{options[:config_file]}: #{min_reads}")
+        say("Current min-write from #{options[:config_file]}: #{min_writes}")
+
+        self.config[prefix]['min-provisioned-reads'] = (min_reads * scale_factor).to_i
+        self.config[prefix]['min-provisioned-writes'] = (min_writes * scale_factor).to_i
+
+        say("New min reads: #{self.config[prefix]['min-provisioned-reads']}", color=:yellow)
+        say("New min writes: #{self.config[prefix]['min-provisioned-writes']}", color=:yellow)
+        say("------------------------------------------------")
+      end
+    else
+      say("Need a factor to scale by,(i.e scale --factor 2)", color=:green)
+      exit
+    end
+  end
+
+  def write_config(scale_factor)
+    if options[:schedule_restore] > 0 
+      restore = "\n\nAuto restore to backup config file (#{self.original_config_file}) in #{options[:schedule_restore]} minutes"
+    else
+      restore = "Backup will be save to #{self.original_config_file}"
+    end
+
+    if self.restore_in_progress
+      confirmed = true
+    else
+      say "#{restore}", color = :white
+      confirmed = yes?("Overwrite the new config file? (yes/no)", color=:white)
+    end
+
+    if confirmed
+      backup
+      
+      str_to_write = ''
+      self.config.each do |section, lines|
+        if !section.include?('pre_section')
+          str_to_write += "[#{section}]\n"
+        end
+
+        lines.each do |line, value|
+          if value =~ /^(#|;|\n)/
+            str_to_write += "#{value}"
+          else
+            str_to_write += "#{line}: #{value}\n"
+          end
+        end
+      end
+      
+      save_file(str_to_write)
+
+      if !self.restore_in_progress
+        reason = ask("\nType the reason for the change: ", color=:magenta)
+      else
+        reason = "Auto restore to #{self.original_config_file}"
+      end
+      
+      log_changes("#{reason} - Changed throughputs by factor of: #{scale_factor}")
+      
+      say("New config changes commited to file")
+    else
+      say("Not doing antything - Goodbye...", color=:green)
+      exit
+    end  
+  end
+
+  def log_changes(msg)
+    say("Recording change in #{self.log_file}")
+
+    File.open(self.log_file, 'a') do |file|
+      file.write "#{Time.now} - #{msg}\n"
+    end
+  end
+
+  def backup
+    say "Backing up config file: #{self.original_config_file}"
+    FileUtils.mkdir_p self.backup_folder
+    FileUtils.cp options[:config_file], self.original_config_file 
+  end
+
+  def save_file(str)
+    File.open(options[:config_file], 'w') do |file|
+      file.write str
+    end
+  end
+
+  def update_aws_api
+    if self.restore_in_progress
+      confirmed = true
+    else
+      confirmed = yes?("\nUpdate all tables with these values on DynamoDb? (yes/no)", color=:white)
+    end
+
+    if confirmed
+     
+      provisioning ={}
+
+      active_throughputs = self.config.keys.select{|k| k =~ /table/}
+      active_throughputs.inject(provisioning) { |acc, config_section|
+        config_section =~ /^(gsi:\ *\^(?<index>.*)\$|)\ *table:\ *\^(?<table>.*)\$/
+        index = $1
+        table = $2
+        
+        if config_section.include?('gsi')
+          acc[table] ||= {}
+          acc[table][index] ||= {}
+          acc[table][index]['reads']  = self.config[config_section]['min-provisioned-reads'].to_i
+          acc[table][index]['writes'] = self.config[config_section]['min-provisioned-writes'].to_i
+        else
+          acc[table] ||= {}
+          acc[table]['reads']  = self.config[config_section]['min-provisioned-reads'].to_i
+          acc[table]['writes'] = self.config[config_section]['min-provisioned-writes'].to_i
+        end
+        acc  
+      }
+      log_changes("Update AWS via api call with the following data:\n #{provisioning}\n")
+      say "\nWill update: #{provisioning.keys.size} tables\n\n\n", color = :blue
+      update_tables(provisioning)
+    else
+      if self.restore_in_progress
+        confirmed = true
+      end
+
+      if options[:start_cmd]
+        confirmed = yes?("Send the start command #{options[:start_cmd]} ? (yes/no)")
+      end
+
+      if confirmed
+        begin
+          if options[:start_cmd]
+            say "Starting up dynamic-dynamodb service using the command #{options[:start_cmd]}", color = :white
+            system(options[:start_cmd])
+          end 
+        rescue Exception => e
+          say "Error trying the start command: #{e.message}", color = :red
+        end
+      end
+      exit
+    end
+  end
+
+  def check_status(table_name)   
+    until table_status(table_name) == 'ACTIVE' && !indexes_status(table_name).any? {|i| i != 'ACTIVE'}
+      say("#{table_name} is not ACTIVE => sleeping for 30 sec and will retry again", color=:yellow)
+      sleep 30
+    end
+    return true
+  end
+
+  def table_status(table_name)
+    print "Checking table #{table_name} status..."
+    status = self.ddb.describe_table({:table_name => table_name}).table.table_status 
+    puts status
+    status
+  end
+
+  def indexes_status(table_name)
+    print "Checking indexes status on #{table_name}..."
+    indexes_status = []
+    if !self.ddb.describe_table({:table_name => table_name}).table.global_secondary_indexes.nil?
+       self.ddb.describe_table({:table_name => table_name}).table.global_secondary_indexes.each {|i| indexes_status << i.index_status }
+    end
+
+    if indexes_status.empty?
+      say("No indexes for #{table_name} table")
+    else 
+      say(indexes_status)
+    end
+    indexes_status
+  end
+
+  def update_single_table(table_options)
+    while true
+      ready = check_status(table_options[:table_name])
+
+      if ready
+        say "Updating provisioning for table: #{table_options[:table_name]}...", color = :cyan
+        begin
+          result = self.ddb.update_table(table_options)
+        rescue Exception => e
+          say "\nUnable to update table: #{e.message}\n", color = :red
+          
+          if e.message.include?('The requested throughput value equals the current value') || e.message.include?('The requested value equals the current value')
+            say "Skipping table update - the requested throughput value equals the current value", color = :yellow
+            return         
+          end
+
+          dynamo_max_limit_error = 'Only 10 tables can be created, updated, or deleted simultaneously'
+          if e.message.include?(dynamo_max_limit_error)
+            say "#{dynamo_max_limit_error}\nTable #{table_options[:table_name]} is not ready for update, waiting 5 sec before retry", color = :yellow
+            sleep 5          
+          end
+
+          say "\nRetrying update on #{table_options[:table_name]}", color = :yellow
+          update_single_table(table_options) if e.message.include?('The requested throughput value equals the current value')          
+        end
+        return
+        
+      else
+        say "Table #{table_options[:table_name]} is not ready for update, waiting 5 sec before retry", color = :yellow
+        sleep 5
+      end
+    end  
+  end
+
+  def update_tables(provisioning)
+    provisioning.each do |table, values|
+      table_options = {
+                  :table_name => table,
+                  :provisioned_throughput => {
+                                              :read_capacity_units =>  values['reads'],
+                                              :write_capacity_units =>  values['writes']
+                  }
+      }
+        
+      # if one of the keys for the table contain index merge the options for update table
+      indexes = provisioning[table].keys.select { |key| key.match(/index/) }
+      if !indexes.empty?
+        indexes.each do |index|
+          table_options.merge!({ 
+                         :global_secondary_index_updates => [{:update => { 
+                                                                            :index_name => index,
+                                                                            :provisioned_throughput => {
+                                                                              :read_capacity_units =>  values[index]['reads'],
+                                                                              :write_capacity_units => values[index]['writes'] 
+                                                                            }
+                                                                          }
+                                                              }]
+          })
+        end
+      end
+
+      update_single_table(table_options)
+    end
+  end
+end

data/lib/{configparser.rb → elasticDynamoDb/configparser.rb}

@@ -7,7 +7,8 @@ class ConfigParser < Hash
     begin
       input_source = File.open(@file_name, "r").each_line if @file_name
     rescue Exception => e
-      puts "error loading file -> #{e}"
+      puts "\e[31mError loading file: #{e}\e[0m\n\n"
+      exit 1
     end
     config = {}
     config_section = nil

data/lib/elasticDynamoDb.rb

@@ -0,0 +1,6 @@
+module ElasticDynamoDb
+  VERSION   = "1.3.0"
+  ABOUT     = "ElasticDynamoDb v#{VERSION} (c) #{Time.now.strftime("2014-%Y")} @innovia"
+  
+  autoload :Cli, 		  'elasticDynamoDb/cli'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticDynamoDb
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ami Mahloof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configparser
@@ -31,7 +31,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
@@ -41,29 +41,29 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.40'
-    - - ! '>='
+        version: 2.0.17
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.40.0
+        version: 2.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.40'
-    - - ! '>='
+        version: 2.0.17
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.40.0
+        version: 2.0.17
 description: Elastically scale up or down with dynamic-dynamodb tool
 email: ami.mahloof@gmail.com
 executables:
@@ -73,10 +73,15 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- .gitignore
+- CHANGES.md
 - LICENSE
 - README.md
 - bin/elasticDynamoDb
-- lib/configparser.rb
+- elasticDynamoDb.gemspec
+- lib/elasticDynamoDb.rb
+- lib/elasticDynamoDb/cli.rb
+- lib/elasticDynamoDb/configparser.rb
 homepage: https://github.com/innovia/ElasticDynamoDb
 licenses:
 - MIT
@@ -87,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: scale dynamodb by factor with dynamic-dynamodb