glean 0.0.9 → 0.0.10

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,41 +1,72 @@
 PATH
   remote: .
   specs:
-    glean (0.0.9)
+    glean (0.0.10)
       git (= 1.2.5)
       gli (= 2.5.4)
+      hashie (= 2.0.3)
+      octokit (= 1.24.0)
       toml (= 0.0.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    addressable (2.3.3)
     blankslate (2.1.2.4)
-    builder (3.1.4)
-    childprocess (0.3.8)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    ffi (1.3.1)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
+    coderay (1.0.9)
+    diff-lcs (1.2.1)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
     git (1.2.5)
     gli (2.5.4)
-    json (1.7.7)
+    guard (1.6.2)
+      listen (>= 0.6.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
+      thor (>= 0.14.6)
+    guard-rspec (2.5.1)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    hashie (2.0.3)
+    listen (0.7.3)
+    lumberjack (1.0.3)
+    method_source (0.8.1)
+    multi_json (1.7.2)
+    multipart-post (1.2.0)
+    netrc (0.7.7)
+    octokit (1.24.0)
+      addressable (~> 2.2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 2.0)
+      multi_json (~> 1.3)
+      netrc (~> 0.7.7)
     parslet (1.5.0)
       blankslate (~> 2.0)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
+    rb-fsevent (0.9.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-nc (0.0.5)
+      rspec (~> 2.9)
+      terminal-notifier (~> 1.4.2)
+    slop (3.4.4)
+    terminal-notifier (1.4.2)
+    terminal-table (1.4.5)
+    thor (0.17.0)
     toml (0.0.3)
       parslet
 
@@ -43,7 +74,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
   glean!
+  guard-rspec
+  pry
   rake
-  rdoc
+  rb-fsevent
+  rspec
+  rspec-nc

data/Guardfile

@@ -0,0 +1,22 @@
+require 'nc'
+
+guard 'rspec', :cli => "--color --format=doc --format=Nc" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/Rakefile

@@ -3,45 +3,6 @@ require 'rake/clean'
 require 'rubygems'
 require 'rubygems/package_task'
 require 'rdoc/task'
-require 'cucumber'
-require 'cucumber/rake/task'
 Bundler::GemHelper.install_tasks
 
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
-  rd.title = 'Your application title'
-end
-
-spec = eval(File.read('glean.gemspec'))
-
-Gem::PackageTask.new(spec) do |pkg|
-end
-CUKE_RESULTS = 'tmp/results.html'
-CLEAN << CUKE_RESULTS
-desc 'Run features'
-Cucumber::Rake::Task.new(:features) do |t|
-  opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
-  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
-  t.cucumber_opts =  opts
-  t.fork = false
-end
-
-desc 'Run features tagged as work-in-progress (@wip)'
-Cucumber::Rake::Task.new('features:wip') do |t|
-  tag_opts = ' --tags ~@pending'
-  tag_opts = ' --tags @wip'
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
-  t.fork = false
-end
-
-task :cucumber => :features
-task 'cucumber:wip' => 'features:wip'
-task :wip => 'features:wip'
-require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
-end
-
-task :default => [:test,:features]
+task :default => []

data/bin/glean

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'gli'
 require 'glean'
+require 'base64'
 
 include GLI::App
 
@@ -8,53 +9,49 @@ program_desc 'A data management tool for humans'
 
 version Glean::VERSION
 
-desc 'Describe some switch here'
-switch [:s,:switch]
-
-desc 'Describe some flag here'
-default_value 'the default'
-arg_name 'The name of the argument'
-flag [:f,:flagname]
-
-desc 'Describe search here'
-arg_name 'Describe arguments to search here'
-command :search do |c|
-  c.desc 'Describe a switch to search'
-  c.switch :s
-
-  c.desc 'Describe a flag to search'
-  c.default_value 'default'
-  c.flag :f
-  c.action do |global_options,options,args|
-
-    # Your command logic here
-     
-    # If you have any errors, just raise them
-    # raise "that command made no sense"
-
-    puts "search command ran"
-  end
-end
-
 desc 'Download a dataset by name'
-arg_name 'dataset_identifier'
+arg_name "<dataset> [<path>]"
 command :get do |c|
   c.action do |global_options,options,args|
     dataset = Glean::Dataset.new(args[0])
   end
 end
 
-desc 'Describe out here'
-arg_name 'Describe arguments to out here'
-command :out do |c|
+desc 'Export a dataset'
+arg_name '<dataset>'
+command :export do |c|
   c.action do |global_options,options,args|
     dataset = Glean::Dataset.new(args[0])
-    dataset.each_datum do |datum|
+    dataset.each do |datum|
       puts datum
     end
   end
 end
 
+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
+  end
+end
+
+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.*$/
+    end
+  end
+end
+
 pre do |global,command,options,args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the

data/glean.gemspec

@@ -11,14 +11,18 @@ spec = Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.require_paths << 'lib'
   s.has_rdoc = true
-  s.extra_rdoc_files = ['README.rdoc','glean.rdoc']
   s.rdoc_options << '--title' << 'glean' << '--main' << 'README.rdoc' << '-ri'
   s.bindir = 'bin'
   s.executables << 'glean'
   s.add_development_dependency('rake')
-  s.add_development_dependency('rdoc')
-  s.add_development_dependency('aruba')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('guard-rspec')
+  s.add_development_dependency('rb-fsevent')
+  s.add_development_dependency('rspec-nc')
+  s.add_development_dependency('pry')
   s.add_runtime_dependency('gli','2.5.4')
   s.add_runtime_dependency('git','1.2.5')
   s.add_runtime_dependency('toml', '0.0.3')
+  s.add_runtime_dependency('octokit', '1.24.0')
+  s.add_runtime_dependency('hashie', '2.0.3')
 end

data/lib/glean/dataset.rb

@@ -2,8 +2,16 @@ 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 = identifier
+      @identifier = Dataset.resolve_identifier(identifier)
       @dir = dir
       sync
     end
@@ -16,19 +24,23 @@ module Glean
       File.join(storage_path, identifier)
     end
 
+    def repo_url
+      "http://github.com/#{identifier}"
+    end
+
     def sync
       Dir.mkdir(storage_path) unless File.exists?(storage_path)
       begin
         g = Git.open(path)
         g.pull
       rescue
-        Git.clone("http://github.com/#{identifier}", identifier, :path => storage_path)
+        Git.clone(repo_url, identifier, :path => storage_path)
       end
     end
 
     def each
-      Dir.glob(File.join(path, "**/*.toml")) do |f|
-        yield TOML.load_file(f)
+      Dir.glob(File.join(path, "**", "*.toml")) do |f|
+        yield Hashie::Mash.new(TOML.load_file(f))
       end
     end
   end

data/lib/glean/version.rb

@@ -1,3 +1,3 @@
 module Glean
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/glean.rb

@@ -3,5 +3,7 @@ require 'glean/dataset'
 
 require 'git'
 require 'toml'
+require 'octokit'
+require 'hashie/mash'
 # Add requires for other files you add to your project here, so
 # you just need to require this one file in your bin file

data/spec/glean/models/dataset_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "Glean::Dataset" do
+  subject(:dataset) { Glean::Dataset.new("glean/countries", "~") }
+
+  describe "#identifier" do
+
+    it "should return the identifier" do
+      expect(dataset.identifier).to eq("glean/countries")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'glean'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glean
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-nc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,32 +155,58 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.24.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.24.0
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 description: 
 email: public@johndbritton.com
 executables:
 - glean
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- glean.rdoc
+extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - README.md
-- README.rdoc
 - Rakefile
 - bin/glean
-- features/glean.feature
-- features/step_definitions/glean_steps.rb
-- features/support/env.rb
 - glean.gemspec
-- glean.rdoc
 - lib/glean.rb
 - lib/glean/dataset.rb
 - lib/glean/version.rb
-- test/default_test.rb
-- test/test_helper.rb
+- spec/glean/models/dataset_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/johndbritton/glean
 licenses: []
 post_install_message: 

data/README.rdoc

@@ -1,6 +0,0 @@
-= glean
-
-Describe your project here
-
-:include:glean.rdoc
-

data/features/glean.feature

@@ -1,8 +0,0 @@
-Feature: My bootstrapped app kinda works
-  In order to get going on coding my awesome app
-  I want to have aruba and cucumber setup
-  So I don't have to do it myself
-
-  Scenario: App just runs
-    When I get help for "glean"
-    Then the exit status should be 0

data/features/step_definitions/glean_steps.rb

@@ -1,6 +0,0 @@
-When /^I get help for "([^"]*)"$/ do |app_name|
-  @app_name = app_name
-  step %(I run `#{app_name} help`)
-end
-
-# Add more step definitions here

data/features/support/env.rb

@@ -1,15 +0,0 @@
-require 'aruba/cucumber'
-
-ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
-
-Before do
-  # Using "announce" causes massive warnings on 1.9.2
-  @puts = true
-  @original_rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-end
-
-After do
-  ENV['RUBYLIB'] = @original_rubylib
-end

data/glean.rdoc

@@ -1,5 +0,0 @@
-= glean
-
-Generate this with
-    glean rdoc
-After you have described your command line interface

data/test/default_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class DefaultTest < Test::Unit::TestCase
-
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_the_truth
-    assert true
-  end
-end

data/test/test_helper.rb

@@ -1,9 +0,0 @@
-require 'test/unit'
-
-# Add test libraries you want to use here, e.g. mocha
-
-class Test::Unit::TestCase
-
-  # Add global extensions to the test case class here
-  
-end