datapimp 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febfc2f5b9415229b62250b31276eda459a7f109
-  data.tar.gz: fb1ace6736e83d803437b984f2a6b05647b70044
+  metadata.gz: cc151c26a29a3f7a68150caf0f4258a69abf5fa9
+  data.tar.gz: b44748c88eb3506558cad01abedb499c67821a7e
 SHA512:
-  metadata.gz: 15ca815bd6cfdacb8b910dc54de072eeff350e474174a0efbb512ba1b248c8d39ffb75c03042fc3ecb3d5f9fba17665156111a5084d545e4c2da6d1fc1724539
-  data.tar.gz: da7451e15f8b8b10ca9016b3356206fde39eca3184921df8752d19e00b5bbe38186546ddf6d19c996900a76cfdb34586e0a8e9e9c024a4c6b454b5f55bfa04a5
+  metadata.gz: 919a2a9fb5b86f6863d4ed13c22d2b038eda4af404f6284fc5970d9a48aa77e62842524e4180c6beffa6f6e1471229614dbdb0ebe137aff1927bd30b02f3a8f2
+  data.tar.gz: 8e2ae2c62e9aadc7839f8a54f929a0ea612fc6f4ac5b1f112748af0a00425969a54473911ae7efdbb5765c2a125b819257b9a22926df08fae2d3436d1d098ecc

data/lib/datapimp/cli/sync.rb

@@ -21,6 +21,7 @@ command "sync data" do |c|
 
   c.option '--type TYPE', String, "What type of source data is this? #{ Datapimp::Sync.data_source_types.join(", ") }"
   c.option '--output FILE', String, "Write the output to a file"
+  c.option '--view NAME', String, "Which view should we display?"
   c.option '--format FORMAT', String, "Which format to serialize the output in? valid options are JSON"
   c.option '--columns NAMES', Array, "Extract only these columns"
   c.option '--relations NAMES', Array, "Also fetch these relationships on the object if applicable"
@@ -31,32 +32,17 @@ command "sync data" do |c|
   Datapimp::Cli.accepts_keys_for(c, :google, :github, :dropbox)
 
   c.action do |args, options|
-    if options.type == "google-spreadsheet" || options.type == "google"
-      Datapimp::DataSync.sync_google_spreadsheet(options, args)
-
-    # TODO
-    # Could totally make this cleaner if we need to support more services
-    elsif options.type == "github-issues"
-      repository  = args.shift
-
-      service = Datapimp::DataSync::Github.new(repository, options)
-      service.sync_issues
-    elsif options.type == "github-milestones"
-      repository  = args.shift
-
-      service = Datapimp::DataSync::Github.new(repository, options)
-      service.sync_milestones
-    elsif options.type == "github-releases"
-      repository  = args.shift
-
-      service = Datapimp::DataSync::Github.new(repository, options)
-      service.sync_releases
-    elsif options.type == "github-issue-comments"
-      repository  = args.shift
-      issue       = args.shift
-
-      service = Datapimp::DataSync::Github.new(repository, options)
-      service.sync_issue_comments(issue)
+    options.default(view:"to_s")
+
+    data = Datapimp::Sync.dispatch_sync_data_action(args.first, options.to_hash)
+
+    result = data.send(options.view)
+    result = JSON.generate(result) if options.format == "json" && options.type != "google-spreadsheet"
+
+    if options.output
+      Pathname(options.output).open("w+") {|fh| fh.write(result) }
+    else
+      puts result
     end
   end
 end

data/lib/datapimp/sources/github_repository.rb

@@ -0,0 +1,67 @@
+module Datapimp::Sources
+  class GithubRepository < Datapimp::Sources::Base
+    attr_reader :options, :repository
+
+    def initialize(repository, options)
+      @repository = repository
+      @options    = options.to_mash
+    end
+
+    def all
+      %w(issues milestones commits releases).reduce({}) do |memo, slice|
+        memo[slice] = send(slice)
+        memo
+      end
+    end
+
+    def to_s
+      all
+    end
+
+    def issues
+      issues = client.issues(repository, filter: "all")
+      issues.map! do |issue|
+        %w(comments events labels).each do |rel|
+          issue[rel] = issue.rels[rel].get.data if relations.include?(rel)
+        end
+        issue
+      end
+      serve_output(issues)
+    end
+
+    def milestones
+      milestones = client.milestones(repository)
+      serve_output(milestones)
+    end
+
+    def releases
+      releases = client.releases(repository)
+      serve_output(releases)
+    end
+
+    def commits
+      commits = client.commits(repository)
+      serve_output(commits)
+    end
+
+    private
+
+    def client
+      @_client ||= Datapimp::Sync.github.api
+    end
+
+    def relations
+      @_relations ||= Array(@options.relations)
+    end
+
+    def serve_output(output)
+      if output.is_a?(Array)
+        output.map! do |o|
+          o.respond_to?(:to_attrs) ? o.send(:to_attrs) : o
+        end
+      end
+
+      output
+    end
+  end
+end

data/lib/datapimp/sync.rb

@@ -7,6 +7,20 @@ module Datapimp
       %w(dropbox amazon github google json excel nokogiri)
     end
 
+    def self.dispatch_sync_data_action(source, options)
+      type = options[:type]
+
+      result = case
+               when type == "github"
+                 Datapimp::Sources::GithubRepository.new(source, options)
+               when type == "google" || type == "google-spreadsheet"
+                 require 'google_drive'
+                 Datapimp::Sources::GoogleSpreadsheet.new(nil, key: source)
+               end
+
+      result
+    end
+
     # Create any type of syncable folder and dispatch a run call to it
     # with whatever options you want.
     #

data/lib/datapimp/version.rb

@@ -1,3 +1,3 @@
 module Datapimp
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jonathan Soeder
@@ -400,7 +400,6 @@ files:
 - lib/datapimp/cli/list.rb
 - lib/datapimp/cli/run.rb
 - lib/datapimp/cli/setup.rb
-- lib/datapimp/cli/support/data_sync.rb
 - lib/datapimp/cli/sync.rb
 - lib/datapimp/cli/view.rb
 - lib/datapimp/clients/amazon.rb
@@ -413,7 +412,7 @@ files:
 - lib/datapimp/sources.rb
 - lib/datapimp/sources/dropbox.rb
 - lib/datapimp/sources/excel.rb
-- lib/datapimp/sources/github.rb
+- lib/datapimp/sources/github_repository.rb
 - lib/datapimp/sources/google.rb
 - lib/datapimp/sources/json.rb
 - lib/datapimp/sources/nokogiri.rb

data/lib/datapimp/cli/support/data_sync.rb

@@ -1,92 +0,0 @@
-module Datapimp::DataSync
-  def self.sync_google_spreadsheet(options, *args)
-    require 'google_drive' unless defined?(::GoogleDrive)
-
-    raise 'Must setup google client' unless Datapimp::Sync.google.spreadsheets
-
-    key = args.shift
-    name = args.shift || "Spreadsheet"
-
-    raise 'Must supply a spreadsheet key' unless key
-
-    spreadsheet = Datapimp::Sources::GoogleSpreadsheet.new(name, key: key)
-
-    if options.output
-      Pathname(options.output).open("w+") do |fh|
-        fh.write(spreadsheet.to_s)
-      end
-    else
-      puts spreadsheet.to_s
-    end
-  end
-
-  class Github
-    attr_reader :options, :repository
-
-    def initialize(repository, options)
-      @repository = repository
-      @options    = options
-    end
-
-    def sync_issues
-      issues = client.issues(repository, filter: "all")
-      issues.map! do |issue|
-        %w(comments events labels).each do |rel|
-          issue[rel] = issue.rels[rel].get.data if relations.include?(rel)
-        end
-        issue
-      end
-      serve_output(issues)
-    end
-
-    def sync_issue_comments(issue_id)
-      comments = client.issue_comments(repository, issue_id)
-      serve_output(comments)
-    end
-
-    def sync_milestones
-      milestones = client.milestones(repository)
-      serve_output(milestones)
-    end
-
-    def sync_releases
-      releases = client.releases(repository)
-      serve_output(releases)
-    end
-
-    def sync_commits
-      commits = client.commits(repository)
-      serve_output(commits)
-    end
-
-    private
-
-    def client
-      @_client ||= Datapimp::Sync.github.api
-    end
-
-    def relations
-      @_relations ||= @options.relations.to_a
-    end
-
-    def serve_output(output)
-      if output.is_a?(Array)
-        output.map! do |o|
-          o.respond_to?(:to_attrs) ? o.send(:to_attrs) : o
-        end
-      end
-
-      if @options.format && @options.format == "json"
-        output = JSON.generate(output)
-      end
-
-      if @options.output
-        Pathname(options.output).open("w+") do |f|
-          f.write(output)
-        end
-      else
-        puts output.to_s
-      end
-    end
-  end
-end

data/lib/datapimp/sources/github.rb

@@ -1,5 +0,0 @@
-module Datapimp::Sources
-  class Github < OpenStruct
-
-  end
-end