shelly 0.0.8 → 0.0.9

data/lib/shelly/base.rb

@@ -1,5 +1,3 @@
-require "yaml"
-
 module Shelly
   class Base
     def current_user
@@ -8,20 +6,8 @@ module Shelly
       @user
     end
 
-    def config
-      @config ||= if File.exists?(config_file_path)
-        YAML::load(File.read(config_file_path))
-      else
-        {}
-      end
-    end
-
-    def config_file_path
-      File.join(current_user.config_dir, "config.yml")
-    end
-
     def shelly
-      @shelly ||= Client.new(current_user.email, current_user.password, config)
+      @shelly ||= Client.new(current_user.email, current_user.password)
     end
   end
 end

data/lib/shelly/client.rb

@@ -19,14 +19,13 @@ module Shelly
       end
     end
 
-    def initialize(email = nil, password = nil, options = {})
+    def initialize(email = nil, password = nil)
       @email = email
       @password = password
-      @options = options
     end
 
     def api_url
-      @options["shelly_url"] || ENV["SHELLY_URL"] || "https://admin.winniecloud.com/apiv2"
+      ENV["SHELLY_URL"] || "https://admin.winniecloud.com/apiv2"
     end
 
     def register_user(email, password, ssh_key)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/shelly/base_spec.rb

@@ -15,21 +15,4 @@ describe Shelly::Base do
       user.password.should == "the-kal-el"
     end
   end
-
-  describe "#config" do
-    context "config file exists" do
-      it "should return loaded config as a Hash" do
-        File.open("~/.shelly/config.yml", "w") { |f| f << "shelly_url: http://api.example.com/v4/\n" }
-        base = Shelly::Base.new
-        base.config.should == {"shelly_url" => "http://api.example.com/v4/"}
-      end
-    end
-
-    context "config file doesn't exist" do
-      it "should return an empty Hash" do
-        base = Shelly::Base.new
-        base.config.should == {}
-      end
-    end
-  end
 end

data/spec/shelly/client_spec.rb

@@ -8,13 +8,6 @@ describe Shelly::Client do
   end
 
   describe "#api_url" do
-    context "API URL passed with options hash" do
-      it "should use provided value" do
-        client = Shelly::Client.new("bob@example.com", "secret", "shelly_url" => "https://api2.example.com")
-        client.api_url.should == "https://api2.example.com"
-      end
-    end
-
     context "env SHELLY_URL is not set" do
       it "should return default API URL" do
         ENV['SHELLY_URL'].should be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 +02:00
+date: 2011-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency