glean 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    glean (0.0.11)
+    glean (0.0.12)
       git (= 1.2.5)
       gli (= 2.5.4)
       hashie (= 2.0.3)

data/bin/glean

@@ -32,13 +32,8 @@ desc 'Show dataset information'
 arg_name '<dataset>'
 command :info do |c|
   c.action do |global_options,options,args|
-    identifier = Glean::Dataset.resolve_identifier(args[0])
-    begin
-      readme = Octokit.readme(identifier)
-      puts Base64.decode64(readme.content)
-    rescue
-      puts "No extended information available"
-    end
+    identifier = Glean::Source.resolve_identifier(args[0])
+    puts Glean::Source.info(identifier)
   end
 end
 
@@ -46,8 +41,8 @@ desc 'Search for datasets'
 arg_name '<query>'
 command :search do |c|
   c.action do |global_options,options,args|
-    Octokit.organization_repositories('glean').each do |repo|
-      puts "#{repo.name} -- #{repo.description}" unless repo.name =~ /^glean.*$/
+    Glean::Source.search(args[0]).each do |datasource|
+      puts "#{datasource.name} -- #{datasource.description}"
     end
   end
 end

data/lib/glean/dataset.rb

@@ -2,16 +2,8 @@ module Glean
   class Dataset
     attr_reader :identifier
 
-    def self.resolve_identifier(identifier)
-      if identifier.include?("/")
-        identifier
-      else
-        "glean/#{identifier}"
-      end
-    end
-
     def initialize(identifier, dir="~")
-      @identifier = Dataset.resolve_identifier(identifier)
+      @identifier = Glean::Source.resolve_identifier(identifier)
       @dir = dir
       sync
     end

data/lib/glean/glean.rb

@@ -0,0 +1,2 @@
+module Glean
+end

data/lib/glean/source/contrib.rb

@@ -0,0 +1,9 @@
+module Glean
+  module Source
+    module Contrib
+      def self.search(query)
+        []
+      end
+    end
+  end
+end

data/lib/glean/source/core.rb

@@ -0,0 +1,12 @@
+module Glean
+  module Source
+    module Core
+      def self.search(query)
+        query = "" if query.nil?
+        Octokit.organization_repositories('glean').select do |repo|
+          "#{repo.name} #{repo.description}".include?(query) unless repo.name =~ /^glean.*$/
+        end
+      end
+    end
+  end
+end

data/lib/glean/source/user.rb

@@ -0,0 +1,9 @@
+module Glean
+  module Source
+    module User
+      def self.search(query)
+        []
+      end
+    end
+  end
+end

data/lib/glean/source.rb

@@ -0,0 +1,22 @@
+module Glean
+  module Source
+    def self.resolve_identifier(identifier)
+      if identifier.include?("/")
+        identifier
+      else
+        "glean/#{identifier}"
+      end
+    end
+
+    def self.search(query)
+      (Core.search(query) + Contrib.search(query) + User.search(query)).sort
+    end
+
+    def self.info(identifier)
+      readme = Octokit.readme(identifier)
+      Base64.decode64(readme.content)
+    rescue
+      "No extended information available"
+    end
+  end
+end

data/lib/glean/version.rb

@@ -1,3 +1,3 @@
 module Glean
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/glean.rb

@@ -1,9 +1,14 @@
-require 'glean/version'
+require 'glean/glean'
 require 'glean/dataset'
+require 'glean/source'
+require 'glean/source/core'
+require 'glean/source/contrib'
+require 'glean/source/user'
+require 'glean/version'
 
 require 'git'
-require 'toml'
-require 'octokit'
 require 'hashie/mash'
+require 'octokit'
+require 'toml'
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glean
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -220,6 +220,11 @@ files:
 - glean.gemspec
 - lib/glean.rb
 - lib/glean/dataset.rb
+- lib/glean/glean.rb
+- lib/glean/source.rb
+- lib/glean/source/contrib.rb
+- lib/glean/source/core.rb
+- lib/glean/source/user.rb
 - lib/glean/version.rb
 - spec/glean/models/dataset_spec.rb
 - spec/spec_helper.rb