vpnmaker 0.0.0 → 1.0.0

data/Gemfile

@@ -8,7 +8,7 @@ group :development do
   gem 'pry-syntax-hacks' #, :git => 'https://github.com/ConradIrwin/pry-syntax-hacks.git'
   gem 'pry-stack_explorer' #, :git =>  'https://github.com/pry/pry-stack_explorer.git'
   gem 'pry-exception_explorer' #, :git => 'https://github.com/pry/pry-exception_explorer.git'
-  gem "rdoc", "~> 3.12"
+  gem "rdoc" #, "~> 3.12"
   gem "bundler" #, "~> 1.0.0"
   gem "jeweler" #, "~> 1.8.3"
 end
@@ -17,9 +17,13 @@ gem 'ipaddr_extensions'
 #, :git => 'git://github.com/jamesotron/IPAddrExtensions.git'
 
 gem 'haml'
-gem 'trollop'
-gem 'gibberish', :git => 'git://github.com/mdp/gibberish.git'
-gem 'rubyzip', :git => 'git://github.com/aussiegeek/rubyzip.git'
-# gem 'slim'
+gem 'main', :git => 'git://github.com/ahoward/main.git'
 
-# gem 'slop', :git => 'git://github.com/injekt/slop.git'
+#gem 'hashugar', :git => 'git://github.com/jsuchal/hashugar.git'
+gem 'highline' #, :git => 'https://github.com/JEG2/highline.git'
+
+#gem 'rbcurse-core', :git => 'git://github.com/rkumar/rbcurse-core.git'
+#gem 'rbcurse-extras', :git => 'git://github.com/rkumar/rbcurse-extras.git'
+
+# gem 'gibberish', :git => 'git://github.com/mdp/gibberish.git'
+# gem 'rubyzip', :git => 'git://github.com/aussiegeek/rubyzip.git'

data/VERSION

@@ -1 +1 @@
-0.0.0
+1.0.0

data/bin/vpnmaker

@@ -1,11 +1,262 @@
 #!/usr/bin/env ruby
 require_relative '../lib/vpnmaker.rb'
-require 'trollop'
+#require 'micro-optparse'
+#require 'highline'
+require 'highline/import'
+require 'main'
 
-opts = Trollop::options do
-  version "vpnmaker 0.0.1 (c) Coolio"
-  banner "vpnmaker [options]"
-  opt :verbose, 'Enable verbose mode'
-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
 
-#raise Trollop::HelpNeeded if ARGV.empty?
+    class Options
+      # main DSL
+      Main do
+        version '0.0.1'
+        author 'Copyleft(cl) VoipScout - No rights reserved'
+
+        mode('init') {
+          mode('cli') {
+            argument('country') {
+              required
+              cast :string
+              arity 1
+            }
+            argument('province') {
+              required
+              cast :string
+              arity 1
+            }
+            argument('city') {
+              required
+              cast :string
+              arity 1
+            }
+            argument('organization') {
+              required
+              cast :string
+              arity 1
+            }
+            argument('email') {
+              required
+              cast :string
+              arity 1
+              validate {|e| e =~ RFC822::EmailAddress}
+            }
+
+          } #mode 'cli'
+
+          argument('conf_name') {
+            required
+            cast :string
+            arity 1
+          }
+          argument('new_dir_path') {
+            required
+            cast :string
+            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,
+                  :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
+        }
+
+        mode('server') {
+          mode('build') {
+            def run
+              db.build_server
+              say('Please edit your config.yaml if you haven\'t done so yet')
+            end
+          }
+          mode('config') {
+            def run
+              puts db.config_generator.server
+            end
+          }
+          keyword('dir') {
+            required
+            arity 1
+            cast :string
+            description "ie. /my/config/vpnmaker.vpn"
+            validate {|dir_name| File.directory?(File.expand_path(dir_name))}
+          }
+
+          argument('server_config_name') {
+            description "filename to save server configuration to"
+            argument :optional
+            cast :string
+            arity -1
+            #TODO: highline, how to not crlf after #agree
+            validate {|fname| File.exist?(fname) ? agree("file exists, overwrite?") : true }
+          }
+          def run
+
+            puts "server run..."
+            puts "need to save fname=#{params['server_config_fname'].value}" if params['server_config_fname'].given?
+          end
+        }
+
+        mode('client') {
+
+          mode('list') {
+            description "ie. vpnmaker clients list"
+            def run
+              pp db.users.select {|u| !db.user(u)[:revoked].include?(db.user(u)[:active_key])}
+              # db.users.each{|u| puts db.user(u)}
+            end
+          }
+
+          mode('config') {
+            def run
+              params['client_name'].values.each do |c|
+                puts db.config_generator.client(db.user(c))
+              end
+            end
+          }
+
+          mode('create') {
+            keyword('passwd') {
+              argument :optional
+              cast :string
+              arity 1
+              default 'passwd'
+            }
+
+            def run
+              params['client_name'].values.each_with_index do |c, i|
+                passwd = params['passwd'].values[i] ? params['passwd'].values[i] : params['passwd'].default
+                db.create_user(c, c, "#{c}@#{db.config[:key_properties][:email].split('@').last}", passwd) if db.users.select {|r| r =~ /#{c}/}.empty?
+              end
+            end
+          }
+
+          mode('destroy') {
+            option('all') {
+              argument :optional
+              cast :bool
+            }
+            def run
+              if params['all'].value
+                db.users.each {|u| db.delete_user(u)} unless db.users.size == 0
+              else
+                params['client_name'].values.each do |c|
+                  db.delete_user(c) unless !db.user(c)
+                end
+              end
+            end
+          }
+
+          mode('regenerate') {
+            keyword('passwd') {
+              argument :optional
+              cast :string
+              arity 1
+              default 'passwd'
+            }
+
+            def run
+              params['client_name'].values.each_with_index do |c, i|
+                passwd = params['passwd'].values[i] ? params['passwd'].values[i] : params['passwd'].default
+                db.regenerate_user(c, passwd)
+              end
+            end
+          }
+
+          argument('client_name') {
+            argument :optional
+            arity -1
+            cast :string
+            #synopsis 'client_name'
+            description "username"
+            # validate {|name|   ? YAML.load_file(path) : {}}
+          }
+          # environment('VPNMAKER_DIR')
+          keyword('dir') {
+            required
+            arity 1
+            cast :string
+            description "ie. /my/config/vpnmaker.vpn"
+            validate {|dir_name| File.directory?(File.expand_path(dir_name))}
+          }
+
+          def run
+            puts "client run"
+          end
+
+        }
+
+        # 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
+
+
+      end #
+
+    end #class Options
+
+  end #module CLI
+end #module VPNMaker
+
+VPNMaker::CLI::Options.new

data/lib/client.haml

@@ -1,13 +1,53 @@
+client
+dev tun
+proto udp
 remote #{server[:host]} #{server[:port]} udp
+remote-random
+resolv-retry infinite
+nobind
 persist-key
-tls-client
-tls-auth ta.key 1
-pull
-ca ca.crt
-dev tun
 persist-tun
-cert #{user}-#{(revoked.max || - 1) + 1}.crt
-nobind
-key #{user}-#{(revoked.max || - 1) + 1}.key
-remote-cert-tls server
+\#
+\#tls-remote must equal CN of ca in the hosts x509
+\#
+tls-remote #{server[:host]}
+
+float
+cipher AES-256-CBC
+comp-lzo
+verb 3
+ping 30
+
+- if type == :default
+  <dh>
+  #{dh}
+  </dh>
+
+  <ca>
+  #{ca}
+  </ca>
+
+  <cert>
+  #{cert}
+  </cert>
+
+  <key>
+  #{key}
+  </key>
+
+  <tls-auth>
+  #{ta}
+  </tls-auth>
+
+- else
+  tls-client
+  tls-auth ta.key 1
+  pull
+  ca ca.crt
+  dev tun
+  persist-tun
+  cert #{user}-#{(revoked.max || - 1) + 1}.crt
+  nobind
+  key #{user}-#{(revoked.max || - 1) + 1}.key
+  remote-cert-tls server
 :plain

data/{foocorp.config.yaml → lib/example_vpnmaker_site.config.yaml}

@@ -1,24 +1,26 @@
+---
+:key_properties:
+  :country: US
+  :province: CA
+  :city: San Francisco
+  :organization: myorg
+  :email: security@my.org
+
 :server:
-  :base_ip: 10.10.10.0
+  :base_ip: 10.10.10.0/24
   :bridgednets: # real networks to bridge via the VPN server
-    - 172.16.0.0
+    - 172.16.0.0/24
   :subnets: # subnets that exist only on the VPN
-    - 10.10.11.0
+    - 10.10.11.0/8
+    - 10.11.2.0/24
   :user: nobody
   :group: nogroup
-  :root: /root/openvpn
+  :root: /etc/openvpn
   :log: /var/log/openvpn.log
-  :host: vpn.foocorp.com
+  :host: staging.pvstream.in
   :port: 1194
 
 :client:
   :subnet: 172.16.0.0
   :local_endpoint: 10.10.10.100
   :remote_endpoint: 10.10.10.1
-
-:key_properties:
-  :country: US
-  :province: CA
-  :city: San Francisco
-  :organization: FooCorp Inc
-  :email: sec@foocorp.com

data/lib/server.haml

@@ -20,11 +20,38 @@ server #{base_ip[:net]} #{base_ip[:mask]}
 \
 user #{user}
 group #{group}
-dh #{root}/keys/dh.pem
-ca #{root}/keys/ca.crt
-cert #{root}/keys/server.crt
-key #{root}/keys/server.key
-crl-verify #{root}/keys/crl.pem
+- if type == :default
+
+  <dh>
+  #{dh}
+  </dh>
+
+  <ca>
+  #{ca}
+  </ca>
+
+  <cert>
+  #{cert}
+  </cert>
+
+  <key>
+  #{key}
+  </key>
+
+  <crl-verify>
+  #{crl}
+  </crl-verify>
+
+  <ta>
+  #{ta}
+  </ta>
+
+- else
+  dh #{root}/keys/dh.pem
+  ca #{root}/keys/ca.crt
+  cert #{root}/keys/server.crt
+  key #{root}/keys/server.key
+  crl-verify #{root}/keys/crl.pem
   
 keepalive 10 120
 
@@ -34,5 +61,4 @@ persist-tun
 persist-key
 
 tls-auth #{root}/keys/ta.key 0
-client-config-dir #{root}/ccd
 :plain

data/lib/vpnmaker.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 
 require 'gibberish'
-require 'rubyzip'
+# require 'rubyzip'
 
 require 'fileutils'
 require 'yaml'
@@ -32,12 +32,14 @@ class HashBinding < Object
 end
 
 module VPNMaker
-  autoload :ConfigGenerator, './vpnmaker/config_generator'
-  autoload :KeyDB, './vpnmaker/key_db'
-  autoload :KeyConfig, './vpnmaker/key_config'
-  autoload :KeyTracker, './vpnmaker/key_tracker'
-  autoload :Manager, './vpnmaker/manager'
-  autoload :KeyBuilder, './vpnmaker/key_builder'
+  path = (File.dirname File.expand_path(__FILE__)) + "/"
+
+  autoload :ConfigGenerator, "#{path}vpnmaker/config_generator"
+  autoload :KeyDB, "#{path}vpnmaker/key_db"
+  autoload :KeyConfig, "#{path}vpnmaker/key_config"
+  autoload :KeyTracker, "#{path}vpnmaker/key_tracker"
+  autoload :Manager, "#{path}vpnmaker/manager"
+  autoload :KeyBuilder, "#{path}vpnmaker/key_builder"
 
   def self.generate(*args)
     KeyTracker.generate(args.first, args.last)

data/lib/vpnmaker/config_generator.rb

@@ -1,21 +1,34 @@
 module VPNMaker
   class ConfigGenerator
-    def initialize(mgr)
-      @mgr = mgr
+    def initialize(*args)
+      @mgr = args.shift.first
+      args.empty? ? (@runtime_cfg = default_template) : (@runtime_cfg = args.shift)
     end
 
+    def default_template
+      @dirname = (@mgr.tracker.path + "/" + @mgr.config[:site][:data_dir])
+      {
+        :type => :default,
+        :dh => File.read(@dirname + "/dh.pem"),
+        :ca => File.read(@dirname + "/ca.crt"),
+        :ta => File.read(@dirname + "/ta.key")
+      }
+    end
     def client_conf(client)
       {
         :gen_host => Socket.gethostname,
         :server => @mgr.config[:server],
         :client => @mgr.config[:client]
-      }.merge(client)
+      }.merge(client).merge(:key => File.read(@dirname + "/#{client[:user]}-#{(client[:revoked].max || - 1) + 1}.key" ),
+                            :cert => File.read(@dirname + "/#{client[:user]}-#{(client[:revoked].max || - 1) + 1}.crt")).merge(@runtime_cfg)
     end
 
     def server_conf
       {
         :gen_host => Socket.gethostname
-      }.merge(@mgr.config[:server])
+      }.merge(@mgr.config[:server]).merge(@runtime_cfg).merge(:key => File.read(@dirname + "/server.key"),
+                                                              :cert => File.read(@dirname + "/server.crt"),
+                                                              :crl => File.read(@dirname + "/crl.pem"))
     end
 
     def server
@@ -23,13 +36,18 @@ module VPNMaker
       haml_vars[:base_ip] = ((a = IPAddr.new haml_vars[:base_ip]); {:net => a.to_s, :mask => a.subnet_mask.to_s})
       haml_vars[:bridgednets] = haml_vars[:bridgednets].map {|net| a = (IPAddr.new net); {:net => a.to_s, :mask => a.subnet_mask.to_s}}
       haml_vars[:subnets] = haml_vars[:subnets].map {|net| a = (IPAddr.new net); {:net => a.to_s, :mask => a.subnet_mask.to_s}}
-      template = File.read(__FILE__.path('server.haml'))
+      template = File.read(@mgr.tracker.path + \
+                           "/" + @mgr.config[:site][:template_dir] + \
+                           "/" + 'server.haml')
       Haml::Engine.new(template).render(Object.new, haml_vars)
     end
 
     def client(client)
       haml_vars = client_conf(client).dup
-      template = File.read(__FILE__.path('client.haml'))
+      template = File.read(@mgr.tracker.path + \
+                           "/" + @mgr.config[:site][:template_dir] + \
+                           "/" + 'client.haml')
+      # template = File.read(__FILE__.path('client.haml'))
       Haml::Engine.new(template).render(Object.new, haml_vars)
     end
   end

data/lib/vpnmaker/key_builder.rb

@@ -39,7 +39,7 @@ module VPNMaker
       c = cnfpath
 
       File.open(cnfpath, 'w') do |f|
-        f.write(Haml::Engine.new(File.read __FILE__.path('openssl.haml')).render(Object.new, opensslvars.merge(hash)))
+        f.write(Haml::Engine.new(File.read(@tracker.path + "/" + @config[:site][:template_dir] + "/" + 'openssl.haml')).render(Object.new, opensslvars.merge(hash)))
       end
 
       c

data/lib/vpnmaker/key_db.rb

@@ -44,7 +44,7 @@ module VPNMaker
     def sync
       if disk_version == @db[:version]
         if @touched
-          FileUtils.mkdir_p(self.datadir)
+          FileUtils.mkdir_p(File.dirname(@path) + "/" + self.datadir)
           @db[:version] += 1
           File.open(@path, 'w') {|f| f.write(@db.to_yaml)}
           true

data/lib/vpnmaker/key_tracker.rb

@@ -3,6 +3,7 @@ module VPNMaker
     attr_reader :builder
     attr_reader :db
     attr_reader :config
+    attr_reader :path
 
     def self.generate(name, path=nil)
       path ||= '/tmp'
@@ -146,6 +147,7 @@ module VPNMaker
     def users; @db[:users]; end
 
     def initialize(name, dir)
+      @path = dir
       @db = KeyDB.new(File.join(dir, name + '.db.yaml'))
       @config = KeyConfig.new(File.join(dir, name + '.config.yaml'))
       @builder = KeyBuilder.new(self, @config)

data/lib/vpnmaker/manager.rb

@@ -50,6 +50,6 @@ module VPNMaker
       @tracker.user(user)
     end
 
-    def config_generator; ConfigGenerator.new(self); end
+    def config_generator(*args); ConfigGenerator.new([self] + args); end
   end
 end

data/vpnmaker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "vpnmaker"
-  s.version = "0.0.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]
-  s.date = "2012-05-06"
+  s.date = "2012-05-09"
   s.description = "haml templates and key tracking"
   s.email = "voipscout@gmail.com"
   s.executables = ["vpnmaker"]
@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/vpnmaker",
-    "foocorp.config.yaml",
     "lib/client.haml",
+    "lib/example_vpnmaker_site.config.yaml",
     "lib/openssl.haml",
     "lib/server.haml",
     "lib/vpnmaker.rb",
@@ -48,9 +48,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ipaddr_extensions>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
-      s.add_runtime_dependency(%q<trollop>, [">= 0"])
-      s.add_runtime_dependency(%q<gibberish>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
+      s.add_runtime_dependency(%q<main>, [">= 0"])
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<pry-doc>, [">= 0"])
       s.add_development_dependency(%q<pry-rails>, [">= 0"])
@@ -58,15 +57,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry-syntax-hacks>, [">= 0"])
       s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
       s.add_development_dependency(%q<pry-exception_explorer>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<trollop>, [">= 0"])
-      s.add_dependency(%q<gibberish>, [">= 0"])
-      s.add_dependency(%q<rubyzip>, [">= 0"])
+      s.add_dependency(%q<main>, [">= 0"])
+      s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<pry-doc>, [">= 0"])
       s.add_dependency(%q<pry-rails>, [">= 0"])
@@ -74,16 +72,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-syntax-hacks>, [">= 0"])
       s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
       s.add_dependency(%q<pry-exception_explorer>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<ipaddr_extensions>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<trollop>, [">= 0"])
-    s.add_dependency(%q<gibberish>, [">= 0"])
-    s.add_dependency(%q<rubyzip>, [">= 0"])
+    s.add_dependency(%q<main>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<pry-doc>, [">= 0"])
     s.add_dependency(%q<pry-rails>, [">= 0"])
@@ -91,7 +88,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry-syntax-hacks>, [">= 0"])
     s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
     s.add_dependency(%q<pry-exception_explorer>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpnmaker
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddr_extensions
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: main
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,23 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gibberish
-  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: rubyzip
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -208,17 +192,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -265,8 +249,8 @@ files:
 - Rakefile
 - VERSION
 - bin/vpnmaker
-- foocorp.config.yaml
 - lib/client.haml
+- lib/example_vpnmaker_site.config.yaml
 - lib/openssl.haml
 - lib/server.haml
 - lib/vpnmaker.rb
@@ -292,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380103579670376846
+      hash: -4049670178564647437
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: