netscaler-cli 0.3.3 → 0.4.0

data/spec/{config_spec.rb → netscaler/config_spec.rb}

@@ -1,4 +1,4 @@
-require 'helpers'
+require 'spec_helpers'
 require 'netscaler/config'
 require 'netscaler/errors'
 
@@ -7,28 +7,42 @@ module Netscaler
   module ConfigurationHelper
     def reading(file)
       actual_file = File.expand_path("./configs/#{file}", File.dirname(__FILE__))
-      Netscaler::ConfigurationReader.new(actual_file)
+      Netscaler::ConfigurationReader.read_config_file(actual_file)
     end
   end
 
   describe "Configuration Reader" do
     include ConfigurationHelper
 
+    before :each do
+      @config = reading('simple-config.yml')
+    end
+
     describe "when reading an existing file" do
       it "should be able to load the basic config file" do
-        reading('simple-config.yml').load_balancers.length.should eql(2)
+        @config.load_balancers.length.should eql(2)
       end
 
       it "should set the username and password correctly when set in the file." do
-        config = reading('simple-config.yml')['something.goes.here']
-        config.username.should eql('some_user')
-        config.password.should eql('somepass')
+        ns = @config['something.goes.here']
+        ns.username.should eql('some_user')
+        ns.password.should eql('somepass')
       end
 
       it "should load via an alias" do
-        config = reading('simple-config.yml')['else']
-        config.alias.should eql('else')
-        config.username.should eql('here')
+        ns = @config['else']
+        ns.alias.should eql('else')
+        ns.username.should eql('here')
+      end
+
+      it "should set the default version to 9.2" do
+        ns = @config['something.goes.here']
+        ns.version.should eql("9.2")
+      end
+
+      it "should read the version if present" do
+        ns = @config['else']
+        ns.version.should eql("9.1")
       end
     end
 

data/spec/{configs → netscaler/configs}/simple-config.yml

@@ -4,4 +4,5 @@ something.goes.here:
 something.else:
   username: here
   alias: else
-  password: blah
+  password: blah
+  version: 9.1

data/spec/netscaler/extenstions_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helpers'
+require 'netscaler/extensions'
+
+describe Array do
+  it "should just print out the [] when empty" do
+    [].to_json.should eql('[]')
+  end
+
+  it "should indent the [] if given" do
+    [].to_json('  ').should eql('  []')
+  end
+
+  class Integer
+    def to_json(prefix=nil)
+      to_s
+    end
+  end
+
+  it "should print out the contents, one line each." do
+    [1, 2, 3].to_json.should eql("[\n  1,\n  2,\n  3\n]\n")
+  end
+
+  it "should print out the contents indented" do
+    [1, 2, 3].to_json('  ').should eql("  [\n    1,\n    2,\n    3\n  ]\n")
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: netscaler-cli
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -15,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
-default_executable: 
+date: 2011-03-08 00:00:00 -08:00
+default_executable: netscaler
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log4r
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -41,11 +39,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
-        version: "0.7"
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,7 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 6
@@ -64,75 +61,137 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: log4r
+  name: choosy
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: autotest-notification
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 1
         - 9
         version: 1.1.9
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: savon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 7
         - 9
         version: 0.7.9
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 6
         version: "1.6"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: choosy
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
+        - 0
         - 2
+        - 3
+        version: 0.2.3
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
         - 2
+        - 5
         - 0
-        version: 2.2.0
+        version: 2.5.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id012
 description: This gem installs several simple command line utilities locally.  It uses the NSConfig.wsdl SOAP interface for remote access.
 email: 
 - madeonamac@gmail.com
 executables: 
-- netscaler-vserver
-- netscaler-service
-- netscaler-server
+- netscaler
 extensions: []
 
 extra_rdoc_files: 
@@ -142,31 +201,30 @@ files:
 - Gemfile.lock
 - README.markdown
 - Rakefile
-- bin/netscaler-server
-- bin/netscaler-service
-- bin/netscaler-vserver
+- bin/netscaler
 - etc/Version
-- lib/netscaler/baseexecutor.rb
-- lib/netscaler/clitemplate.rb
+- lib/netscaler/base_request.rb
+- lib/netscaler/cli.rb
 - lib/netscaler/config.rb
 - lib/netscaler/errors.rb
+- lib/netscaler/executor.rb
+- lib/netscaler/extensions.rb
 - lib/netscaler/logging.rb
-- lib/netscaler/server/cli.rb
-- lib/netscaler/server/executor.rb
-- lib/netscaler/service/cli.rb
-- lib/netscaler/service/executor.rb
+- lib/netscaler/server/request.rb
+- lib/netscaler/server/response.rb
+- lib/netscaler/service/request.rb
+- lib/netscaler/service/response.rb
 - lib/netscaler/transaction.rb
 - lib/netscaler/version.rb
-- lib/netscaler/vserver/cli.rb
-- lib/netscaler/vserver/executor.rb
-- spec/config_spec.rb
-- spec/configs/bad-yaml.yml
-- spec/configs/missing-username.yml
-- spec/configs/simple-config.yml
-- spec/helpers.rb
-- spec/server/cli_spec.rb
-- spec/service/cli_spec.rb
-- spec/vserver/cli_spec.rb
+- lib/netscaler/vserver/request.rb
+- lib/netscaler/vserver/response.rb
+- spec/netscaler/cli_spec.rb
+- spec/netscaler/config_spec.rb
+- spec/netscaler/configs/bad-yaml.yml
+- spec/netscaler/configs/missing-username.yml
+- spec/netscaler/configs/simple-config.yml
+- spec/netscaler/extenstions_spec.rb
+- spec/spec_helpers.rb
 has_rdoc: true
 homepage: http://github.com/gabemc/netscaler-cli
 licenses: []
@@ -181,7 +239,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -190,7 +247,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -202,8 +258,7 @@ signing_key:
 specification_version: 3
 summary: Simple command line utilities for interacting remotely with a Netscaler load balancer.
 test_files: 
-- spec/config_spec.rb
-- spec/helpers.rb
-- spec/server/cli_spec.rb
-- spec/service/cli_spec.rb
-- spec/vserver/cli_spec.rb
+- spec/netscaler/cli_spec.rb
+- spec/netscaler/config_spec.rb
+- spec/netscaler/extenstions_spec.rb
+- spec/spec_helpers.rb

data/bin/netscaler-service

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'netscaler/service/cli'
-Netscaler::Service::CLI.new(ARGV).execute!

data/bin/netscaler-vserver

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'netscaler/vserver/cli'
-Netscaler::VServer::CLI.new(ARGV).execute!

data/lib/netscaler/clitemplate.rb

@@ -1,147 +0,0 @@
-require 'optparse'
-require 'netscaler/errors'
-require 'netscaler/version'
-require 'netscaler/logging'
-require 'netscaler/transaction'
-require 'netscaler/config'
-
-module Netscaler
-  class CLITemplate
-    attr_reader :options, :args, :host, :cli_type
-
-    def initialize(cli_type, args)
-      @cli_type = cli_type
-      @args = args
-    end
-
-    def execute!
-      begin
-        parse!(@args.dup)
-        Netscaler::Logging.configure(options[:debug])
-        
-        Netscaler::Transaction.new(netscaler_configuration) do |client|
-          action = options[:action][0]
-          executor = create_executor(client)
-          
-          executor.send(action, options)
-        end
-      rescue SystemExit => e
-        raise
-      rescue Netscaler::ConfigurationError => e
-        print_error(e.message)
-      rescue OptionParser::ParseError => e
-        print_error(e.message)
-      rescue Exception => e
-        STDERR.puts e.backtrace
-        print_error(e.message)
-      end
-    end
-
-    def parse!(args)
-      parse_options(args)
-      validate_args(args)
-    end
-
-    def parse_options(args)
-      @options ||= {}
-      if @options.empty?
-        @options[:action] = Array.new
-      end
-      @parsed_options ||= OptionParser.new do |opts|
-        interface_header(opts)
-        interface_configuration(opts)
-        interface_actions(opts)
-        interface_information(opts)
-      end.parse!(args)
-    end
-
-    def interface_configuration(opts)
-      opts.separator "   Configuration: "
-      opts.on('-n', '--netscaler NETSCALER',
-              "The IP or hostname of the Netscaler",
-              "load balancer.",
-              "This argument is required.") do |n|
-        options[:netscaler] = n
-      end
-      opts.on('-c', '--config CONFIG',
-              "The path to the netscaler-cli configuration",
-              "file.  By default, it is the ",
-              "~/.netscaler-cli.yml") do |c|
-        options[:config] = c
-      end
-      opts.separator ""
-    end
-
-    def interface_information(opts)
-      opts.separator "   Informative:"
-      opts.on('--debug', 
-              "Prints extra debug information") do |d|
-        options[:debug] = d
-      end
-      opts.on('--json',
-              "Prints out JSON data instead of textual output.") do |j|
-        options[:json] = j
-      end
-      opts.on('-v', '--version',
-              "Show the version information") do |v|
-        puts "#{File.basename($0)} version: #{Netscaler::Version.to_s}"
-        exit
-      end
-      opts.on('-h', '--help',
-              "Show this help message") do
-        puts opts
-        exit
-      end
-
-      opts.separator ""
-    end
-
-    def requires_argument?
-      true
-    end
-
-    def validate_noargs
-    end
-
-    def validate_args(args)
-      if args.length == 0
-        if requires_argument?
-          raise Netscaler::ConfigurationError.new("No hosts specified to act on.")
-        else
-          validate_noargs
-        end
-      elsif args.length != 1
-        raise Netscaler::ConfigurationError.new("Only one #{cli_type} can be acted on at a time.")
-      else
-        @host = args[0]
-      end
-
-      if options[:action].empty?
-        options[:action] << :status
-      elsif options[:action].length != 1
-        raise Netscaler::ConfigurationError.new("Multiple actions specified -- only one action is supported at a time.")
-      end
-
-      if options[:netscaler].nil?
-        raise Netscaler::ConfigurationError.new("No Netscaler IP/Hostname given.")
-      end
-    end
-
-    def netscaler_configuration
-      reader = Netscaler::ConfigurationReader.new(options[:config])
-      config = reader[options[:netscaler]]
-      if config.nil?
-        raise Netscaler::ConfigurationError.new("The Netscaler address '#{options[:netscaler]}' is not defined in the configuration file")
-      end
-
-      config
-    end
-
-    private
-    def print_error(e)
-      STDERR.puts "#{File.basename($0)}: #{e}"
-      STDERR.puts "Try '#{File.basename($0)} --help' for more information"
-      exit 1
-    end
-  end # CLI
-end