beats-client 0.2.1 → 0.3.0

data/.gitignore

@@ -4,3 +4,5 @@ Gemfile.lock
 pkg/*
 .yardoc/
 doc/
+*~
+*#

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@beats-ruby-client --create
+rvm 1.9.3@beats-ruby-client --create

data/HISTORY.md

@@ -1,4 +1,9 @@
 
+### 0.3.0 (2012-02-29)
+
+* Added an "ingest" command
+* Support for adapter plug-ins
+
 ### 0.2.1 (2012-02-09)
 
 * Much improved documentation (using YARD)

data/beats-client.gemspec

@@ -5,8 +5,8 @@ require "beats/version"
 Gem::Specification.new do |s|
   s.name        = "beats-client"
   s.version     = Beats::VERSION
-  s.authors     = ["Niklas Holmgren"]
-  s.email       = ["niklas@sutajio.se"]
+  s.authors     = ["Niklas Holmgren", "Sebastian Falk"]
+  s.email       = ["niklas@sutajio.se", "sebastian.falk@netlight.se"]
   s.homepage    = "https://github.com/ProjectDaisy/beats-ruby-client"
   s.summary     = %q{A CLI client and SDK for Beats API}
   s.description = %q{A CLI client and SDK for Beats API}

data/lib/beats/client.rb

@@ -70,6 +70,12 @@ module Beats
     def sentence
       decode_json(get(resolve_uri(@base_url, href(:sentence))))
     end
+    
+    def add_resource(resource)
+      decode_json(post(resolve_uri(@base_url, ""), 
+        MultiJson.encode(resource), 
+        'Content-Type' => 'application/json')) 
+    end
 
     private
 

data/lib/beats/command.rb

@@ -10,20 +10,22 @@ module Beats
     DEFAULT_COMMAND = 'help'
 
     class << self
-      def parse(command)
+      def parse(command, *args)
         command = DEFAULT_COMMAND if command == ''
         parts = command.split(':')
         klass = command_class(parts.first)
         if klass.has_command?(parts.last)
-          [klass, parts.last.to_sym]
+          [klass.new(*args.flatten), parts.last.to_sym]
+        elsif klass.has_command?('gem_execute')
+          [klass.new(*args.flatten << parts.last), 'gem_execute'.to_sym]
         else
           raise InvalidCommand, command
         end
       end
 
       def run(command, *args)
-        klass, method = parse(command)
-        klass.new(*args.flatten).send(method)
+        object, method = parse(command, *args)
+        object.send(method)
       rescue RestClient::Unauthorized => e
         puts '!!! AUTHENTICATION REQUIRED !!!'
         run 'auth:login'
@@ -36,6 +38,8 @@ module Beats
         error "Unable to connect to server. Your internet connection might be down."
       rescue InvalidCommand => e
         error "Unknown command: #{e.to_s}"
+      rescue LoadError => e 
+        error "Load error: #{e.to_s}"
       rescue CommandFailed => e
         error e.message
       rescue Interrupt => e

data/lib/beats/commands/base.rb

@@ -54,6 +54,12 @@ module Beats
           end
         end
 
+        def load_adapter(adapter)
+          require "beats-adapter-#{adapter}"
+        rescue LoadError
+          raise InvalidCommand, "ingest:#{adapter}"
+        end
+
     end
   end
 end

data/lib/beats/commands/help.rb

@@ -23,6 +23,9 @@ module Beats
         command_group('The sentence:') do
           command 'sentence', 'show the sentence'
         end
+        command_group('Ingest commands:') do
+          command 'ingest:<adapter>', 'ingest using an adapter plugin, e.g. ingest:discogs'
+        end
       end
 
       private

data/lib/beats/commands/ingest.rb

@@ -0,0 +1,22 @@
+module Beats
+  module Command
+    class Ingest < Base
+
+      def ingest
+        display 'Usage: beats ingest:<adapter> [options]'
+      end
+
+      def gem_execute
+        adapter = args.pop
+        load_adapter(adapter)
+        # TODO: Add a general solution to CamelCase the adapter?
+        handler = Beats.const_get('Adapter').const_get(adapter.capitalize!).const_get('Handler').new(args)
+        handler.each_release do |release|
+          display YAML.dump(release)
+          client.add_resource(release)
+        end
+      end
+
+    end
+  end
+end

data/lib/beats/version.rb

@@ -1,3 +1,3 @@
 module Beats
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/test/client_test.rb

@@ -58,5 +58,20 @@ class ClientTest < Test::Unit::TestCase
       end
     end
   end
+  def test_can_add_resource
+    @client.add_resource(
+     {"type"=>"Album",
+       "name"=>"Dwight Live",
+       "artist"=>"Dwight Yoakam",
+       "tracks"=>
+        [{"type"=>"Track",
+           "artist"=>"Dwight Yoakam",
+           "name"=>"Little Sister",
+            "album"=>"Dwight Live"},
+            {"type"=>"Track",
+                "artist"=>"Dwight Yoakam",
+                 "name"=>"It Only Hurts When I Cry",
+     "album"=>"Dwight Live"}]})
+  end
 
 end

data/test/command_test.rb

@@ -9,11 +9,18 @@ end
 class CommandTest < Test::Unit::TestCase
 
   def test_should_resolve_commands
-    assert_equal [Beats::Command::Help, :help], Beats::Command.parse('')
-    assert_equal [Beats::Command::Test, :test], Beats::Command.parse('test')
-    assert_equal [Beats::Command::Test, :foo], Beats::Command.parse('test:foo')
+    Beats::Command::Help.new.to_s
+    Beats::Command.parse('').to_s
+    assert command_answer_ok?(Beats::Command.parse(''), Beats::Command::Help, :help)
+    assert command_answer_ok?(Beats::Command.parse('test'), Beats::Command::Test, :test)
+    assert command_answer_ok?(Beats::Command.parse('test:foo'), Beats::Command::Test, :foo)
+    assert command_answer_ok?(Beats::Command.parse('ingest:discogs'), Beats::Command::Ingest, :gem_execute)
   end
 
+  def command_answer_ok?(arr, klass, sym)
+    arr[0].instance_of?(klass) && arr[1] == sym
+  end
+  
   def test_should_raise_exeption_if_command_could_not_be_resolved
     assert_raises Beats::Command::InvalidCommand do
       Beats::Command.parse('foo')

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: beats-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
 - Niklas Holmgren
+- Sebastian Falk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70303674723960 !ruby/object:Gem::Requirement
+  requirement: &70232077106980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303674723960
+  version_requirements: *70232077106980
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70303674723540 !ruby/object:Gem::Requirement
+  requirement: &70232077106080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303674723540
+  version_requirements: *70232077106080
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70303674723120 !ruby/object:Gem::Requirement
+  requirement: &70232077105200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303674723120
+  version_requirements: *70232077105200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70303674722700 !ruby/object:Gem::Requirement
+  requirement: &70232077104540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303674722700
+  version_requirements: *70232077104540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70303674722280 !ruby/object:Gem::Requirement
+  requirement: &70232077103880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303674722280
+  version_requirements: *70232077103880
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70303674721860 !ruby/object:Gem::Requirement
+  requirement: &70232077103380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303674721860
+  version_requirements: *70232077103380
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &70303674721440 !ruby/object:Gem::Requirement
+  requirement: &70232077102180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303674721440
+  version_requirements: *70232077102180
 description: A CLI client and SDK for Beats API
 email:
 - niklas@sutajio.se
+- sebastian.falk@netlight.se
 executables:
 - beats
 extensions: []
@@ -114,6 +116,7 @@ files:
 - lib/beats/commands/auth.rb
 - lib/beats/commands/base.rb
 - lib/beats/commands/help.rb
+- lib/beats/commands/ingest.rb
 - lib/beats/commands/sentence.rb
 - lib/beats/commands/version.rb
 - lib/beats/version.rb