ispunity 0.0.2 → 0.0.3

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'rspec'
 gem "log4r", "~> 1.1.10"
 gem "i18n"
+gem "thor"

data/README

@@ -1,7 +1,6 @@
 1.Install rvm
-
-        curl -L get.rvm.io | bash -s stable
-        source /etc/profile.d/rvm.sh
+  - curl -L get.rvm.io | bash -s stable
+  - source /etc/profile.d/rvm.sh
 
 Find the requirements;
 
@@ -10,22 +9,43 @@ Find the requirements;
 install the additional dependencies as mentioned. 
 
 2. Install ruby
-        rvm install 1.9.3
+   - rvm install 1.9.3
+
+3. Install
+  3.1 Install from gem
+  ======================
+    1. gem install ispunity
+   
+
+  3.2 Install from source
+  =======================
+    1. cd /opt
 
-3. cd /opt
+    2. Install IspUnity ( make sure you have git installed)
+      -  git clone git://github.com/aruntomar/isp_unity.git
 
-4. Install IspUnity ( make sure you have git installed)
+    3. cd /opt/isp_unity
 
-        git clone git://github.com/aruntomar/isp_unity.git
+    4. bundle install
 
-4. cd /opt/isp_unity
+4. Using configuration file
+   - We have provided with sample configuration file under config folder with the name configuration.json.example that must be copied under /etc folder.
+   - cp -v config/configuration.json.example /etc/ispunity.json
 
-5. bundle install
+5. modify the json file to suit your network. 
 
-6. cp -v config/configuration.json.example config/configuration.json
+6. How to execute
+   - As user root execute the following command 
+   - ispunity
 
-7. modify the json file to suit your network. 
+7. Usage
+  ispunity clear_rules  # Clear the rules setup by the routing policy
+  ispunity configfile   # Uses the config file provided/passed to the application
+  ispunity help [TASK]  # Describe available tasks or one specific task
+  ispunity license      # Displays the license
+  ispunity monitor      # Start monitoring the isp connections.
+  ispunity setup        # Setup the application
+  ispunity version      # Displays the version of Ispunity
 
-8. Ruby ispunity
-        ruby setup.rb
+      
 

data/bin/ispunity

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+$LOAD_PATH << File.join(File.dirname(__FILE__),'..','lib')
+require 'thor'
+require 'isp_unity'
+
+class Ispunity < Thor
+  desc "version","Displays the version of Ispunity"
+  def version
+    puts '0.0.2'
+  end
+
+  desc "setup","Setup the application"
+  def setup
+    puts "Starting the setup application"
+    IspUnity.setup
+  end
+
+  desc "monitor","Start monitoring the isp connections."
+  def monitor
+    puts "Starting to monitor the application"
+    IspUnity.monitor
+  end
+
+  desc "configfile","Uses the config file provided/passed to the application"
+  method_option :configfile, :aliases => "-c", :desc => "Config file"
+  def configfile(file)
+    puts "Using the config file #{file}"
+  end
+
+  desc "clear_rules","Clear the rules setup by the routing policy"
+  def clear_rules
+    puts 'Clearing the rules.'
+  end
+
+  desc "license","Displays the license"
+  def license
+    File.open("../license",'r') do |f|
+      puts f.readlines
+    end
+  end
+
+end
+
+Ispunity.start

data/config/settings.yml

@@ -1,9 +1,15 @@
 development:
   ubuntu:
     rt_table_path: '/etc/iproute2/rt_tables'
-    config_file_path: 'config/configuration.json'
+    config_file_path: '/etc/ispunity.json'
 
 test:
   ubuntu:
     rt_table_path: './spec/rt_tables'
     config_file_path: './spec/config/configuration.json'
+
+production:
+  ubuntu:
+    rt_table_path: '/etc/iproute2/rt_tables'
+    config_file_path: '/etc/ispunity.json'
+

data/isp_unity.gemspec

@@ -4,7 +4,7 @@ require "isp_unity/version"
 
 Gem::Specification.new do |s|
   s.name        = "ispunity"
-  s.version     = "0.0.2" 
+  s.version     = "0.0.3" 
   s.authors     = ["Pratik Shah", "Siva Gollapalli", "Arun Tomar"]
   s.email       = ["pratik14shah@gmail.com", "sivagollapalli@yahoo.com", "arun@solutionenterprises.co.in"]
   s.homepage    = "http://www.ispunity.com"
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.add_dependency("log4r", "~> 1.1.10")
   s.add_dependency("i18n")
   s.add_dependency("json")
+  s.add_dependency("thor")
 
 
   s.rubyforge_project = "ispunity"

data/lib/isp_unity.rb

@@ -17,7 +17,7 @@ module IspUnity
   config_file = File.join([File.expand_path(File.dirname(__FILE__)), '..', 'config', 'settings.yml'])
   ENV['GEM_ENV'] ||= 'development'
   PATH = YAML.load_file( config_file )[ENV['GEM_ENV']]['ubuntu']
-  ConfigFilePath =  File.join([File.expand_path(File.dirname(__FILE__)), '..',PATH['config_file_path']])
+  ConfigFilePath =  File.join(PATH['config_file_path'])
   RoutingTablePath = PATH['rt_table_path'].to_s
 
   class IspUnityException < Exception
@@ -31,18 +31,25 @@ module IspUnity
 
     def setup
       IspUnity.config
+      isp_lists = IspUnity.isp_config_list
       IspUnityLog.info(I18n.t('file.write'))
-      Route.build_commands(IspUnity.isp_config_list)
+      Route.build_commands(isp_lists)
+      route_command = Route.commands
       IspUnityLog.info(I18n.t('route.build_commands'))
-      if SystemCall.execute(Route.commands)
+      IspUnityLog.debug("Route Command: #{route_command}")
+      if SystemCall.execute(route_command)
         IspUnityLog.info(I18n.t('system_call.execute.route.success'))
-        Rule.build_commands(IspUnity.isp_config_list)
+        Rule.build_commands(isp_lists)
+	rule_command = Rule.commands
         IspUnityLog.info(I18n.t('rule.build_commands'))
-        SystemCall.execute(Rule.commands)
+      	IspUnityLog.debug("Rule Command: #{rule_command}")
+        SystemCall.execute(rule_command)
         IspUnityLog.info(I18n.t('system_call.execute.rule.success'))
-        LoadBalance.build_commands(IspUnity.isp_config_list)
+        LoadBalance.build_commands(isp_lists)
+	load_balance_command = LoadBalance.commands
         IspUnityLog.info(I18n.t('load_balance.build_commands'))
-        SystemCall.execute(LoadBalance.commands)
+      	IspUnityLog.debug("Load Balance Command: #{load_balance_command}")
+        SystemCall.execute(load_balance_command)
         IspUnityLog.info(I18n.t('system_call.execute.load_balance.success'))
       end
     end

data/lib/isp_unity_log.rb

@@ -9,5 +9,5 @@ filename = "ispunity.log"
 IspUnityLog = Logger.new("log")
 IspUnityLog.level = DEBUG
 pf = PatternFormatter.new(:pattern => "%d %l %m")
-IspUnityLog.outputters = FileOutputter.new("IspUnity", :filename => File.join(File.dirname(__FILE__),"..","log",filename), :formatter => pf)
+IspUnityLog.outputters = FileOutputter.new("IspUnity", :filename => File.join("/var","log",filename), :formatter => pf)
  

data/lib/load_balance/load_balance.rb

@@ -7,11 +7,18 @@ class LoadBalance
       @commands = []
       alive_isps = []
       isps.each do |isp|
-	 alive_isps << isp if is_alive(isp) 
+	 if is_alive(isp) 
+	   alive_isps << isp 
+           IspUnityLog.info("#{isp.name} is online")
+	 else
+           IspUnityLog.info("#{isp.name} is offline")
+	 end
       end
       if alive_isps.size == 1
+        IspUnityLog.info("Only 1 isp is alive")
         @commands << "/sbin/ip route replace default via #{alive_isps[0].gateway} dev #{alive_isps[0].interface}" 
       else
+        IspUnityLog.info("Multiple isps are alive")
         @commands << "/sbin/ip route replace default scope global "
         alive_isps.each do |isp|
           @commands[0] += " nexthop via #{isp.gateway} dev #{isp.interface} weight #{isp.weight} "  
@@ -25,8 +32,10 @@ class LoadBalance
       return false unless isp.enabled == 'true'
       result = `/bin/ping -c 3 -I #{isp.ip_address} #{$ip_cluster.sample}`
       if result.match("100% packet loss")
+           IspUnityLog.info("100% packet loss for #{isp.name}")
           return false
       else
+          IspUnityLog.info("0% packet loss for #{isp.name}")
           return true
       end
     end

data/license

@@ -1,3 +1,5 @@
+MIT License
+
 IspUnity Copyright (C) 2012 Arun Tomar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ispunity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -61,6 +61,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: With IspUnity, you can 1.Use multiple internet connections simultaneously
   and get all their throughput. 2.Automatic failover on working net connection if
   any on of the internet connection goes down.
@@ -68,7 +84,8 @@ email:
 - pratik14shah@gmail.com
 - sivagollapalli@yahoo.com
 - arun@solutionenterprises.co.in
-executables: []
+executables:
+- ispunity
 extensions: []
 extra_rdoc_files: []
 files:
@@ -77,6 +94,7 @@ files:
 - Gemfile
 - README
 - Rakefile
+- bin/ispunity
 - config/configuration.json.example
 - config/locale/en.yml
 - config/settings.yml