wpa_cli_web 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDQ3YTA3N2ViN2Q1NzFmMTg4MmFmYzdlOTVjN2IzY2ZlMzljN2NkNw==
+    N2VlN2JhNzYwNGI1ZTZkY2UxNmYxMzkzY2Q0M2E1MTA3OGQyOGJiOA==
   data.tar.gz: !binary |-
-    ODQyZmJjYzQ4MWI4MDlmY2NjNGQ0ZTg0OTZlYmQ5YzAyYzk2NDE4OA==
+    MjcyOTIyNjZmZjRiYmNiYmY4NjM0NTY1ZmQyMGU3ZGNhM2JiMDEwMw==
 SHA512:
   metadata.gz: !binary |-
-    YTYxYmMxNDA4ZmM0NzIxYjc2YTdkZWM1ODY5ZTA5YmVlNGFjYjdhNWRlZjM1
-    NmEzYmZlYTExZmExMmE2OGI4NGUxNDdjZDdmMGI5NDA2ZTNlMzFmMTU3Y2E4
-    OTViZDAxN2Q1NjNiNTNlZWFmOTk3OWZjMDBkYmZhMWZkYTQ0ZTg=
+    NWU3YTFkNzJlZWNjOWFmMTNhNWI2OWIzOTYyMGZlZGEwMTZhOTg1NWZkYTZi
+    NGNjOTZmZWY4NjhlYzRjZGRlNWY1ZTZiM2VmMjliMzg5NTBmNGY1MmEyNjZj
+    ZWU5YTNiMzU4ZDg3YzQwYzY2YmY1YTFjNDQ0OTE4YjIxNzk5MGI=
   data.tar.gz: !binary |-
-    ZWMxM2U5Y2JiMTc5NDlhNzgxMTQ4ZDFhYjRlOGQzMDFmNDgyZjEwZjY2MjQw
-    MThhOTMxZTc4NTM0NjgzOTQ5MTIwNDNmNTk5MGM3ODE0OTdhMjE3YmUxZTAz
-    MTc1MTFkMThlOGY1NjI3OGYwNDY4ZjRlMzE1ZTEyMTRmYTc0OWY=
+    ZmFmYmRmODNhOGFjY2I3N2M5ZWJkY2NmNDJiYmM3Yzc5NWYzZTA1ZDU4MGQ3
+    NzczOTllMTA4NjU3MDVlZjQ5MTJjNDBjYzA2NDNhNTJhZTA5ZGY1OTkwODBi
+    NTMyOGVhOWMwZWZlZjVlYTIzMWU5NTY5YjJkYzJmNzQ2NjViNTk=

data/lib/wpa_cli_web.rb

@@ -6,10 +6,12 @@ class WpaCliWeb < Sinatra::Base
   include WpaCliRuby
 
   def self.wpa_cli_client
-    if settings.development?
-      WpaCli.new(DummyWpaCliWrapper.new)
-    else
+    raise 'wpa_cli not available' if settings.production? && !WpaCliWrapper.available?
+
+    if WpaCliWrapper.available?
       WpaCli.new
+    else
+      WpaCli.new(DummyWpaCliWrapper.new)
     end
   end
 
@@ -69,10 +71,10 @@ class WpaCliWeb < Sinatra::Base
     ssid = params[:ssid]
     password = params[:password]
     wpa_cli_client.set_network(id, "ssid", ssid)
-    if password
-      wpa_cli_client.set_network(id, "psk", password)
+    if password.empty?
+      wpa_cli_client.set_network(id, "key_mgmt", :NONE)
     else
-      wpa_cli_client.set_network(id, "key_mgmt", "NONE")
+      wpa_cli_client.set_network(id, "psk", password)
     end
     wpa_cli_client.set_network(id, "disabled", 0)
     wpa_cli_client.save_config

data/wpa_cli_web.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "wpa_cli_web"
-  spec.version       = "0.0.13"
+  spec.version       = "0.0.14"
   spec.authors       = ["Chris Lowis", "Andrew Nicolaou"]
   spec.email         = ["chris.lowis@gmail.com"]
   spec.description   = %q{Web interface for configuring wifi using wpa_cli}
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sinatra"
-  spec.add_dependency "wpa_cli_ruby"
+  spec.add_dependency "wpa_cli_ruby", ">= 0.0.2"
   spec.add_dependency "thin"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wpa_cli_web
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Chris Lowis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement