wl 0.0.5 → 0.0.6

data/README.md

@@ -29,3 +29,8 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Acknowledgements
+
+This little side-project might not exist without bsmt's clever [reverse engineering of Wunderlist's API](http://bsmt.me/blog/2013/03/02/reverse-engineering-the-wunderlist-api/), 
+so thank you [@bsmt](https://github.com/bsmt). Of course this wouldn't be possible without Wunderlist itself, thanks [@6wunderkinder](https://github.com/6wunderkinder)!

data/bin/wl

@@ -2,4 +2,4 @@
 
 require 'wl'
 
-Wl::CLI.start
+Wl::CLI::Root.start

data/lib/wl.rb

@@ -4,7 +4,5 @@ module Wl
   autoload :Client, 'wl/client'
   autoload :CLI,    'wl/cli'
   autoload :Dotwl,  'wl/dotwl'
-  autoload :List,   'wl/list'
-  autoload :Login,  'wl/login'
-  autoload :Task,   'wl/task'
+  autoload :Models, 'wl/models'
 end

data/lib/wl/cli.rb

@@ -1,37 +1,8 @@
-require 'thor'
-require 'highline'
-
 module Wl
-  class CLI < Thor
-    desc 'login', 'Logs in to Wunderlist'
-    option :email, desc: 'Wunderlist email'
-    option :password, desc: 'Wunderlist password'
-    def login
-      email = options[:email] || ui.ask('Wunderlist email: ')
-      password = options[:password] || ui.ask('Wunderlist password: ') { |q| q.echo = '*' }
-
-      login = client.login(email, password)
-
-      say login.to_json
-    end
-
-    desc 'tasks', 'Lists all your tasks'
-    def tasks
-      say client.tasks.to_json
-    end
-
-    desc 'lists', 'Lists all your lists'
-    def lists
-      say client.lists.to_json
-    end
-
-    private
-    def client
-      @client ||= Wl::Client.new(dotwl: Dotwl.new)
-    end
-
-    def ui
-      @ui ||= HighLine.new
-    end
+  module CLI
+    autoload :Auth,  'wl/cli/auth'
+    autoload :Lists, 'wl/cli/lists'
+    autoload :Tasks, 'wl/cli/tasks'
+    autoload :Root,  'wl/cli/root'
   end
 end

data/lib/wl/cli/auth.rb

@@ -0,0 +1,29 @@
+require 'thor'
+require 'highline'
+
+module Wl
+  module CLI
+    class Auth < Thor
+      desc 'login', 'Log in to Wunderlist'
+      option :email, desc: 'Wunderlist email'
+      option :password, desc: 'Wunderlist password'
+      def login
+        email = options[:email] || ui.ask('Wunderlist email: ')
+        password = options[:password] || ui.ask('Wunderlist password: ') { |q| q.echo = '*' }
+
+        login = client.login(email, password)
+
+        say login.to_json
+      end
+
+      private
+      def ui
+        HighLine.new
+      end
+
+      def client
+        Client.new(dotwl: Dotwl.new)
+      end
+    end
+  end
+end

data/lib/wl/cli/lists.rb

@@ -0,0 +1,19 @@
+require 'thor'
+
+module Wl
+  module CLI
+    class Lists < Thor
+      desc 'index', 'Lists all your lists'
+      def index
+        say client.lists.to_json
+      end
+
+      default_task :index
+
+      private
+      def client
+        Client.new(dotwl: Dotwl.new)
+      end
+    end
+  end
+end

data/lib/wl/cli/root.rb

@@ -0,0 +1,11 @@
+require 'thor'
+
+module Wl
+  module CLI
+    class Root < Thor
+      register Auth,  :auth,  'auth',  'Manage your authentication credentials'
+      register Tasks, :tasks, 'tasks', 'Manage your tasks'
+      register Lists, :lists, 'lists', 'Manage your lists'
+    end
+  end
+end

data/lib/wl/cli/tasks.rb

@@ -0,0 +1,19 @@
+require 'thor'
+
+module Wl
+  module CLI
+    class Tasks < Thor
+      desc 'index', 'Lists all your tasks'
+      def index
+        say client.tasks.to_json
+      end
+
+      default_task :index
+
+      private
+      def client
+        Client.new(dotwl: Dotwl.new)
+      end
+    end
+  end
+end

data/lib/wl/client.rb

@@ -9,17 +9,17 @@ module Wl
     shy :dotwl
 
     def login(email, password)
-      login = post('login', extra_query: {email: email, password: password}, transformer: Login)
+      login = post('login', extra_query: {email: email, password: password}, transformer: Models::Login)
       dotwl.login(login)
       login
     end
 
     def tasks
-      get('me/tasks', transformer: Task)
+      get('me/tasks', transformer: Models::Task)
     end
 
     def lists
-      get('me/lists', transformer: List)
+      get('me/lists', transformer: Models::List)
     end
 
     def base_request_options

data/lib/wl/models.rb

@@ -0,0 +1,7 @@
+module Wl
+  module Models
+    autoload :List,   'wl/models/list'
+    autoload :Login,  'wl/models/login'
+    autoload :Task,   'wl/models/task'
+  end
+end

data/lib/wl/{list.rb → models/list.rb}

@@ -1,7 +1,8 @@
 require 'api_smith'
 
 module Wl
-  class List < APISmith::Smash
+  module Models
+    class List < APISmith::Smash
       property :title
       property :created_at
       property :updated_at
@@ -12,5 +13,6 @@ module Wl
       property :id
       property :owner_id
       property :errors
+    end
   end
 end

data/lib/wl/models/login.rb

@@ -0,0 +1,21 @@
+require 'api_smith'
+
+module Wl
+  module Models
+    class Login < APISmith::Smash
+      property :id
+      property :product
+      property :name
+      property :settings
+      property :created_at
+      property :updated_at
+      property :email
+      property :token
+      property :avatar
+      property :confirmation_state
+      property :type
+      property :email_confirmed
+      property :errors
+    end
+  end
+end

data/lib/wl/models/task.rb

@@ -0,0 +1,32 @@
+require 'api_smith'
+
+module Wl
+  module Models
+    class Task < APISmith::Smash
+      property :id
+      property :assignee_id
+      property :completed_at
+      property :created_at
+      property :created_by_id
+      property :deleted_at
+      property :due_date
+      property :list_id
+      property :local_identifier
+      property :note
+      property :owner_id
+      property :parent_id
+      property :position
+      property :recurrence_count
+      property :recurrence_type
+      property :recurring_parent_id
+      property :starred
+      property :title
+      property :type
+      property :updated_at
+      property :updated_by_id
+      property :user_id
+      property :version
+      property :errors
+    end
+  end
+end

data/lib/wl/version.rb

@@ -1,3 +1,3 @@
 module Wl
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/wl/cli_spec.rb

@@ -5,7 +5,7 @@ module Wl
     let(:dotwl) { double(Dotwl, token: nil).as_null_object }
 
     subject do
-      Wl::CLI.start(args)
+      Wl::CLI::Root.start(args)
     end
 
     before do
@@ -21,8 +21,8 @@ module Wl
       end
     end
 
-    describe 'login', vcr: {cassette_name: 'login'} do
-      let(:args) { %w"login --email fake@example.com --password fakepass" }
+    describe 'auth login', vcr: {cassette_name: 'login'} do
+      let(:args) { %w"auth login --email fake@example.com --password fakepass" }
 
       it 'retrieves a token on behalf of the user' do
         output = capture(:stdout) { subject }
@@ -30,7 +30,7 @@ module Wl
       end
 
       context 'when an email and password are not provided' do
-        let(:args) { %w"login" }
+        let(:args) { %w"auth login" }
 
         it 'asks the user for each' do
           ui = mock(HighLine).as_null_object

data/spec/wl/client_spec.rb

@@ -12,13 +12,13 @@ module Wl
       context 'when the email address and password are accepted', vcr: {cassette_name: 'login'} do
         it 'packages the api response in a Login object' do
           response = subject.login('fake@example.com', 'fakepass')
-          response.should be_a(Login)
+          response.should be_a(Models::Login)
           response.email.should == 'fake@example.com'
           response.errors.should be_nil
         end
 
         it 'stores the token' do
-          dotwl.should_receive(:login).with(an_instance_of(Login))
+          dotwl.should_receive(:login).with(an_instance_of(Models::Login))
           subject.login('fake@example.com', 'fakepass')
         end
       end
@@ -26,7 +26,7 @@ module Wl
       context 'when something goes wrong' do
         it 'inserts the errors into the Login object', vcr: {cassette_name: 'login'} do
           response = subject.login('fake@example.com', 'badpassword')
-          response.should be_a(Login)
+          response.should be_a(Models::Login)
           response.email.should be_nil
           response.errors['type'].should eq('not_found.no_such_user')
         end

data/spec/wl/dotwl_spec.rb

@@ -30,7 +30,7 @@ module Wl
 
     describe '#login' do
       before do
-        fake_login = double(Login, token: 'faketoken')
+        fake_login = double(Models::Login, token: 'faketoken')
         subject.login(fake_login)
       end
 

data/spec/wl/{list_spec.rb → models/list_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Wl
+module Wl::Models
   describe List do
     it { should be_an(APISmith::Smash) }
   end

data/spec/wl/{login_spec.rb → models/login_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Wl
+module Wl::Models
   describe Login do
     it { should be_an(APISmith::Smash) }
   end

data/spec/wl/{task_spec.rb → models/task_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Wl
+module Wl::Models
   describe Task do
     it { should be_an(APISmith::Smash) }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wl
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -176,11 +176,16 @@ files:
 - bin/wl
 - lib/wl.rb
 - lib/wl/cli.rb
+- lib/wl/cli/auth.rb
+- lib/wl/cli/lists.rb
+- lib/wl/cli/root.rb
+- lib/wl/cli/tasks.rb
 - lib/wl/client.rb
 - lib/wl/dotwl.rb
-- lib/wl/list.rb
-- lib/wl/login.rb
-- lib/wl/task.rb
+- lib/wl/models.rb
+- lib/wl/models/list.rb
+- lib/wl/models/login.rb
+- lib/wl/models/task.rb
 - lib/wl/version.rb
 - spec/cassettes/lists.yml
 - spec/cassettes/login.yml
@@ -191,9 +196,9 @@ files:
 - spec/wl/cli_spec.rb
 - spec/wl/client_spec.rb
 - spec/wl/dotwl_spec.rb
-- spec/wl/list_spec.rb
-- spec/wl/login_spec.rb
-- spec/wl/task_spec.rb
+- spec/wl/models/list_spec.rb
+- spec/wl/models/login_spec.rb
+- spec/wl/models/task_spec.rb
 - wl.gemspec
 homepage: http://github.com/hiremaga/wl
 licenses:
@@ -210,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3677924530743277966
+      hash: 2853585498009773397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3677924530743277966
+      hash: 2853585498009773397
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -237,6 +242,6 @@ test_files:
 - spec/wl/cli_spec.rb
 - spec/wl/client_spec.rb
 - spec/wl/dotwl_spec.rb
-- spec/wl/list_spec.rb
-- spec/wl/login_spec.rb
-- spec/wl/task_spec.rb
+- spec/wl/models/list_spec.rb
+- spec/wl/models/login_spec.rb
+- spec/wl/models/task_spec.rb

data/lib/wl/login.rb

@@ -1,19 +0,0 @@
-require 'api_smith'
-
-module Wl
-  class Login < APISmith::Smash
-    property :id
-    property :product
-    property :name
-    property :settings
-    property :created_at
-    property :updated_at
-    property :email
-    property :token
-    property :avatar
-    property :confirmation_state
-    property :type
-    property :email_confirmed
-    property :errors
-  end
-end

data/lib/wl/task.rb

@@ -1,30 +0,0 @@
-require 'api_smith'
-
-module Wl
-  class Task < APISmith::Smash
-    property :id
-    property :assignee_id
-    property :completed_at
-    property :created_at
-    property :created_by_id
-    property :deleted_at
-    property :due_date
-    property :list_id
-    property :local_identifier
-    property :note
-    property :owner_id
-    property :parent_id
-    property :position
-    property :recurrence_count
-    property :recurrence_type
-    property :recurring_parent_id
-    property :starred
-    property :title
-    property :type
-    property :updated_at
-    property :updated_by_id
-    property :user_id
-    property :version
-    property :errors
-  end
-end