vpnmaker 1.0.10 → 1.0.11

data/Gemfile

@@ -48,3 +48,5 @@ gem 'ipaddr_extensions'
 # reporting
 # gem 'ruport'
 # gem 'ruport-util'
+
+gem 'ya_email_validator'

data/Rakefile

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
 begin
@@ -26,23 +25,6 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-# require 'rake/testtask'
-# Rake::TestTask.new(:test) do |test|
-#   test.libs << 'lib' << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-# end
-
-# require 'rcov/rcovtask'
-# Rcov::RcovTask.new do |test|
-#   test.libs << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-#   test.rcov_opts << '--exclude "gems/*"'
-# end
-
-# task :default => :test
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -52,48 +34,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-# require 'highline/import'
-# require File.join(File.dirname(__FILE__), 'vpnmaker')
-
-# def get_arg(argname, echo=true)
-#   return ENV[argname] if ENV[argname]
-#   ask("Value for #{argname}?") { |q| q.echo = false unless echo }
-# end
-
-# namespace :config do
-#   desc 'Generate server config'
-#   task :server => :environment do
-#     puts $manager.config_generator.server
-#   end
-
-#   desc 'Generate client config'
-#   task :client => :environment do
-#     username = get_arg('username')
-#     puts $manager.config_generator.client($manager.user(username))
-#   end
-# end
-
-# namespace :user do
-#   desc 'Create a new user'
-#   task :create => :environment do
-#     cn = get_arg('cn')
-#     name = get_arg('name')
-#     email = get_arg('email')
-#     password = get_arg('password', false)
-#     confirm_password = get_arg('confirm_password', false)
-#     raise ArgumentError.new("Password mismatch") unless password == confirm_password
-
-#     if password.length > 0
-#       $manager.create_user(cn, name, email, password)
-#     else
-#       $manager.create_user(cn, name, email)
-#     end
-#   end
-# end
-
-# # Set up environment
-# task :environment do
-#   vpndir = get_arg('vpndir')
-#   $manager = VPNMaker::Manager.new(vpndir)
-# end

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.0.11

data/bin/vpnmaker

@@ -2,35 +2,20 @@
 require_relative '../lib/vpnmaker.rb'
 #require 'micro-optparse'
 #require 'highline'
+require 'ya_email_validator'
 require 'highline/import'
 require 'main'
 
+# This validates email addresses
+class String; include YaEmailValidator; end
+
 #TODO: use ~/.vpnmaker .vpnmaker and /etc/vpnmaker | maybe vpnmakerrc
 module VPNMaker
   module CLI
-    module RFC822
-      EmailAddress = begin
-                       qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
-                       dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'
-                       atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-' +
-                         '\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'
-                       quoted_pair = '\\x5c[\\x00-\\x7f]'
-                       domain_literal = "\\x5b(?:#{dtext}|#{quoted_pair})*\\x5d"
-                       quoted_string = "\\x22(?:#{qtext}|#{quoted_pair})*\\x22"
-                       domain_ref = atom
-                       sub_domain = "(?:#{domain_ref}|#{domain_literal})"
-                       word = "(?:#{atom}|#{quoted_string})"
-                       domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
-                       local_part = "#{word}(?:\\x2e#{word})*"
-                       addr_spec = "#{local_part}\\x40#{domain}"
-                       pattern = /\A#{addr_spec.force_encoding('ASCII-8BIT')}\z/
-                     end
-    end
-
     class Options
       # main DSL
       Main do
-        version '0.0.1'
+        version File.read(File.expand_path("../..", __FILE__) + "/VERSION")
         author 'Copyleft(cl) VoipScout - No rights reserved'
 
         mode('init') {
@@ -74,7 +59,7 @@ module VPNMaker
               required
               cast :string
               arity 1
-              validate {|e| e =~ RFC822::EmailAddress}
+              validate {|e| e.email?}
             }
 
           } #mode 'cli'
@@ -90,46 +75,9 @@ module VPNMaker
             arity 1
             validate {|dir| File.directory?(File.expand_path(dir))}
           }
-          def run
-            name = params['conf_name'].value
-            dir = params['new_dir_path'].value
-
-            VPNMaker.generate name, dir
-
-            data_dir = (File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + "_data")
-            template_dir = (File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + "_templates")
-            client_config_dir = (File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + "_client_configs")
 
-            [data_dir, template_dir, client_config_dir].each {|dir| FileUtils.mkdir_p(dir)}
-            lib_dir = File.dirname(File.expand_path __FILE__).gsub('/bin', '/lib')
-            FileUtils.cp Dir.glob(lib_dir + "/*.haml"), template_dir
-
-            if params['email'].given?
-              initial_config = {
-                :key_properties => {
-                  :country => params['country'].value,
-                  :province => params['province'].value,
-                  :city => params['city'].value,
-                  :organization => params['organization'].value,
-                  :organization_unit => params['organization_unit'].value,
-                  :common_name => params['common_name'].value,
-                  :name => params['key_name'].value,
-                  :email => params['email'].value
-                },
-                :site => {
-                  :data_dir => data_dir.split('/').last,
-                  :template_dir => template_dir.split('/').last,
-                  :client_conf_dir => client_config_dir.split('/').last
-                }
-              }
-              example_config = YAML.load_file(lib_dir + "/example_vpnmaker_site.config.yaml").to_yaml.gsub(/\n|---/, "\n#")
-              File.open((File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + ".config.yaml"), 'w') {|f| f.write(initial_config.to_yaml + example_config)}
-              mgr = VPNMaker::Manager.new((File.expand_path(dir) + "/" + name + ".vpn"))
-              mgr.build_ca
-              say("Please edit files in #{template_dir} and #{dir}/#{name}.vpn/#{name}.config.yaml before proceeding further")
-            else
-              say('Time to mod yaml files')
-            end
+          def run
+            get_init_config
           end
         }
 
@@ -294,23 +242,55 @@ EOS
 
         }
 
-        # Global run() is overwritten by specific mode run
-        def run
-          puts "Hitting global run()"
-          params.each {|p| pp "#{p.class} - #{p.name} => #{p.value}"}
-          @opts = params
-          pp @opts
-        end
-
         def db
           VPNMaker::Manager.new params['dir'].value
         end
 
+        def get_init_config
+          name = params['conf_name'].value
+          dir = params['new_dir_path'].value
 
-      end #
+          VPNMaker.generate name, dir
 
-    end #class Options
+          data_dir = (File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + "_data")
+          template_dir = (File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + "_templates")
+          client_config_dir = (File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + "_client_configs")
+
+          [data_dir, template_dir, client_config_dir].each {|dir| FileUtils.mkdir_p(dir)}
+          lib_dir = File.dirname(File.expand_path __FILE__).gsub('/bin', '/lib')
+          FileUtils.cp Dir.glob(lib_dir + "/*.haml"), template_dir
+
+          if params['email'].given?
+            initial_config = {
+              :key_properties => {
+                :country => params['country'].value,
+                :province => params['province'].value,
+                :city => params['city'].value,
+                :organization => params['organization'].value,
+                :organization_unit => params['organization_unit'].value,
+                :common_name => params['common_name'].value,
+                :name => params['key_name'].value,
+                :email => params['email'].value
+              },
+              :site => {
+                :data_dir => data_dir.split('/').last,
+                :template_dir => template_dir.split('/').last,
+                :client_conf_dir => client_config_dir.split('/').last
+              }
+            }
 
+            example_config = YAML.load_file(lib_dir + "/example_vpnmaker_site.config.yaml").to_yaml.gsub(/\n|---/, "\n#")
+            File.open((File.expand_path(dir) + "/" + name + ".vpn" + "/" + name + ".config.yaml"), 'w') {|f| f.write(initial_config.to_yaml + example_config)}
+            mgr = VPNMaker::Manager.new((File.expand_path(dir) + "/" + name + ".vpn"))
+            mgr.build_ca
+            say("Please edit files in #{template_dir} and #{dir}/#{name}.vpn/#{name}.config.yaml before proceeding further")
+          else
+            say('Time to mod yaml files')
+          end
+        end
+
+      end # Main {}
+    end #class Options
   end #module CLI
 end #module VPNMaker
 

data/vpnmaker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vpnmaker"
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]
-  s.date = "2012-05-11"
+  s.date = "2012-05-12"
   s.description = "haml templates and key tracking"
   s.email = "voipscout@gmail.com"
   s.executables = ["vpnmaker"]
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<gibberish>, [">= 0"])
       s.add_runtime_dependency(%q<chronic>, [">= 0"])
       s.add_runtime_dependency(%q<ipaddr_extensions>, [">= 0"])
+      s.add_runtime_dependency(%q<ya_email_validator>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<pry-doc>, [">= 0"])
       s.add_development_dependency(%q<pry-rails>, [">= 0"])
@@ -72,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<gibberish>, [">= 0"])
       s.add_dependency(%q<chronic>, [">= 0"])
       s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
+      s.add_dependency(%q<ya_email_validator>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<pry-doc>, [">= 0"])
       s.add_dependency(%q<pry-rails>, [">= 0"])
@@ -90,6 +92,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<gibberish>, [">= 0"])
     s.add_dependency(%q<chronic>, [">= 0"])
     s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
+    s.add_dependency(%q<ya_email_validator>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<pry-doc>, [">= 0"])
     s.add_dependency(%q<pry-rails>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpnmaker
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ya_email_validator
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -311,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3119479742236297403
+      hash: -930937730295424088
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: