vpn-config 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b428d53dd9bd6ff78c96ce3ae747d7bd962e7a
-  data.tar.gz: 8a4595c5b90d8dce348a76b1f57dfe2c87824526
+  metadata.gz: 475738afa271eaec1b58f69c482543e87ba90040
+  data.tar.gz: 54825eb2eef5fbe103e09a72658595f65b60afa2
 SHA512:
-  metadata.gz: fe1a1d209a32ce56c164aab5b258fb21850eb940e349d1587c958b7462a59adfc1450deb4f79b11a707e32f6c59f5c6d95cb55427cc5dcfdbc8c5284e1387a40
-  data.tar.gz: 88a46ea0eb843bc54ad5f56646cc5e91571ddcbe075705da10dabf3cc746adc87b68b3cc107c03b80c6f958405b6c8f2c3c71a5860410cd92161f0a371e00d3a
+  metadata.gz: b9ee6c47639fb29b92e43c6b5cb8b8b05c5f3addd04c8cad8a10c77925c460c66d0b08eff794df981af0d81eee50cad9c5041a87e85c7f4969c0faf21ace24d1
+  data.tar.gz: db748e6743fb6f5c97a21622c469c92913a1760e620d4761799701318faccbedb69c9649ad1c1266a5cc40c17e3b1322c8e2d3744eaa1e3f3c84771b0ec5b611

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
-  - 2.2.1
+- 2.2.1
+env:
+  global:
+    secure: Crjz3GT7vLX3neQ88SgN7T+Ykl/tahF9LVCwqYtNIfWQVI0cpej3+x77TJ24J3AyJmujFIF+/IY5pxcdOpDL3PcOvICx9ZxmRie0CqmgJg+xZNYjIvsJJQjVqkTjiNS2vBAKleavd0VHgcso94QqC7m7j6TklpoGKz3iHDN44Eo=
+script: rake test

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.0.1] - 2015-04-03
+
+* Small internal improvements
+* Documentation improvements
+
+
 ## [1.0.0] - 2015-04-03
 
 * Initial release of the gem

data/README.md

@@ -1,6 +1,6 @@
 # VPN Config
 
-[![Build Status](https://travis-ci.org/matiaskorhonen/vpn-config.svg?branch=master)](https://travis-ci.org/matiaskorhonen/vpn-config)
+[![Build Status](https://travis-ci.org/matiaskorhonen/vpn-config.svg?branch=master)](https://travis-ci.org/matiaskorhonen/vpn-config) [![Gem Version](https://badge.fury.io/rb/vpn-config.svg)](http://badge.fury.io/rb/vpn-config) [![Code Climate](https://codeclimate.com/github/matiaskorhonen/vpn-config/badges/gpa.svg)](https://codeclimate.com/github/matiaskorhonen/vpn-config) [![Test Coverage](https://codeclimate.com/github/matiaskorhonen/vpn-config/badges/coverage.svg)](https://codeclimate.com/github/matiaskorhonen/vpn-config)
 
 Generate iOS/OS X configuration profiles for VPNs.
 
@@ -25,27 +25,27 @@ For information on a specific command: `vpn-config help COMMAND`
 To generate a configuration file for the default VPN Provider (Private Internet Access), run:
 
 ```sh
-vpn-config generate --username=foo --password=bar test.mobileconfig
+vpn-config generate test.mobileconfig --username=foo --password=bar
 ```
 
 To sign the configuration file, also give the `--sign` argument:
 
 ```sh
-vpn-config generate --username=foo --password=bar --sign test.mobileconfig
+vpn-config generate test.mobileconfig --username=foo --password=bar --sign
 ```
 
 To select specific endpoints, use the `--endpoints` option:
 
 ```sh
-vpn-config generate --username=foo --password=bar --sign  \
---endpoints "US East" "Canada" "Hong Kong" test.mobileconfig
+vpn-config generate test.mobileconfig --username=foo --password=bar --sign  \
+--endpoints "US East" "Canada" "Hong Kong"
 ```
 
 To sign with your own certificate, simply provide the path and passphrase (the certificate **must** be a PKCS12 file):
 
 ```sh
-vpn-config generate --username=foo --password=bar --sign \
---certificate-path my.p12 --certificate-pass SuperSecret test.mobileconfig
+vpn-config generate test.mobileconfig --username=foo --password=bar --sign \
+--certificate-path my.p12 --certificate-pass SuperSecret
 ```
 
 ### Supply your own data file
@@ -53,8 +53,8 @@ vpn-config generate --username=foo --password=bar --sign \
 If you wish, you can use your own VPN list instead of the built-in list:
 
 ```sh
-vpn-config generate --username=foo --password=bar --sign \
---data-file mydata.yml --provider "My Provider" test.mobileconfig
+vpn-config generate test.mobileconfig --username=foo --password=bar --sign \
+--data-file mydata.yml --provider "My Provider"
 ```
 
 Use the [data/providers.yml](https://github.com/matiaskorhonen/vpn-config/blob/master/data/providers.yml) file as an example of how to format your list.

data/lib/vpn/config/cli.rb

@@ -17,23 +17,15 @@ module VPN
       method_option :sign, type: :boolean, default: false, aliases: "-S"
       method_option :data_file, type: :string, required: false, banner: "YAML_FILE", aliases: "-d"
       def generate(output_file)
-        datafile = if options[:data_file]
-          File.expand_path(options[:data_file])
-        end
-
-        certificate_path = if options[:certificate_path]
-          File.expand_path(options[:certificate_path])
-        end
-
         generator = VPN::Config::Generator.new(
           auth_name: options[:username],
           auth_pass: options[:password],
           identifier: options[:identifier],
-          certificate_path: certificate_path,
+          certificate_path: expand_path(options[:certificate_path]),
           certificate_pass: options[:certificate_pass],
           endpoints: options[:endpoints],
           provider: options[:provider],
-          data_file: datafile
+          data_file: expand_path(options[:data_file])
         )
 
         plist = if options[:sign]
@@ -62,11 +54,7 @@ module VPN
       method_option :data_file, type: :string, required: false, banner: "YAML_FILE", aliases: "-d"
       method_option :verbose, type: :boolean, default: false, aliases: "-v"
       def providers
-        datafile = if options[:data_file]
-          File.expand_path(options[:data_file])
-        end
-
-        generator = VPN::Config::Generator.new(data_file: datafile)
+        generator = VPN::Config::Generator.new(data_file: expand_path(options[:data_file]))
         generator.providers.each do |pr|
           puts "* " + pr["name"]
           if options[:verbose]
@@ -80,11 +68,7 @@ module VPN
       method_option :data_file, type: :string, required: false, banner: "YAML_FILE", aliases: "-d"
       method_option :verbose, type: :boolean, default: false, aliases: "-v"
       def endpoints(provider="Private Internet Access")
-        datafile = if options[:data_file]
-          File.expand_path(options[:data_file])
-        end
-
-        generator = VPN::Config::Generator.new(data_file: datafile)
+        generator = VPN::Config::Generator.new(data_file: expand_path(options[:data_file]))
         provider = generator.providers.find {|pr| pr["name"] =~ Regexp.new(provider, Regexp::IGNORECASE) }
         if provider
           provider["endpoints"].each do |e|
@@ -99,6 +83,12 @@ module VPN
           abort "No provider found"
         end
       end
+
+      no_commands do
+        private def expand_path(path)
+          path ? File.expand_path(path) : nil
+        end
+      end
     end
   end
 end

data/lib/vpn/config/version.rb

@@ -1,5 +1,5 @@
 module VPN
   module Config
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/vpn-config.gemspec

@@ -19,11 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.2.0"
+
   spec.add_dependency "plist"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.5.1"
-  spec.add_development_dependency "simplecov", "~> 0.9.2"
+  spec.add_development_dependency "minitest", "~> 5.5"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpn-config
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matias Korhonen
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: '5.5'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.4'
 description: Generate signed and unsigned iOS/OS X configuration profiles for VPNs
 email:
 - matias@kiskolabs.com
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="