gisture 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562752af4ac2795824b1624d31fa1d4140198eab
-  data.tar.gz: c70c205d2041bef77bd7f030cb8831a449917751
+  metadata.gz: ab45da4ed2c2d6056ff570a3acb5fb65040c4a9e
+  data.tar.gz: 4b59c005cb105f398c21cc0587c46b129cca8080
 SHA512:
-  metadata.gz: 6e625ab43f9d65f19e0261b29998634c1aa9d5d0d55bd447c4eaabe2d239dbbfd869c7c1143bb16a0ef3e67cef3abafdb3ccbe205142f29efc6216e805f78066
-  data.tar.gz: 74d045d2265805b027b5c15908e82d4fb798d22856f471168a75786919d60a537ee58e3cfd8a0589af784c9a4796e39589b39c2fcdfeb4d3388e97167b43a0af
+  metadata.gz: 949934e74b6d675074d0a07677650671d1dd29d2b937b37694030c56a200fe3d3db727cec96f829f205f735376c21a59a1fec95fe093fe756e64d1407c574b2f
+  data.tar.gz: ef22d5df5fb865b17051ff3f4ebb0738bc2a2f00a7de4247072a061499b00bcd9b2183b924ee7298157e9502328e5c394b5a1a18cb3ed4ca1484eaadab6eef3e

data/lib/gisture/cloned_file.rb

@@ -44,7 +44,7 @@ module Gisture
       path = ::File.join(clone_path, file_path)
       @clone_path = clone_path
       @tempfile = ::File.new(path)
-      file_hash = Hashie::Mash.new({path: path, filename: ::File.basename(path), content: tempfile.read})
+      file_hash = Hashie::Mash.new({path: path, filename: file_path, content: tempfile.read})
       super(file_hash, basename: basename, strategy: strategy)
     end
   end

data/lib/gisture/commands/repo/file/run.rb

@@ -0,0 +1,84 @@
+require 'kommand/commands'
+
+module Gisture
+  module Commands
+    module Repo
+      module File
+        class Run
+          include Kommand::Commands::Command
+
+          command_name 'repo:file:run'
+          command_summary "Run a repo file directly from the command line"
+          valid_argument Kommand::Scripts::Argument.new("-f, --filename", summary: "Specify a filename if it's not included in the repo URL")
+          valid_argument Kommand::Scripts::Argument.new("-s, --strategy", summary: "Execution strategy, defaults to 'eval'")
+          valid_argument Kommand::Scripts::Argument.new("-e, --evaluator", summary: "Use a custom evaluator class, only applies to 'eval' strategy")
+          valid_argument Kommand::Scripts::Argument.new("-c, --clone", summary: "Clone the repo into a local tmp path and run from that working dir")
+          validate_arguments false
+
+          class << self
+            def usage
+              puts "usage: #{Kommand.kommand} #{command_name} GIST_ID_OR_URL #{valid_arguments.to_s}"
+              unless valid_arguments.empty?
+                puts
+                puts "Arguments:"
+                puts valid_arguments.to_help
+              end
+            end
+          end
+
+          def run
+            clone? ? repo.clone! : repo.destroy_clone!
+
+            result = file.run!
+
+            if strategy == :exec
+              puts result
+            else
+              result
+            end
+          end
+
+          protected
+
+          def file
+            @file ||= repo.file((repo_url[1] || filename), strategy: strategy)
+          end
+
+          def repo
+            @repo ||= Gisture.repo(repo_url[0])
+          end
+
+          def repo_url
+            Gisture::Repo.parse_file_url(arguments.unnamed.first.value)
+          rescue
+            [Gisture::Repo.parse_repo_url(arguments.unnamed.first.value).join('/')]
+          end
+
+          def strategy
+            @strategy ||= begin
+              strat = arguments.get(:strategy) || 'eval'
+              if strat == 'eval'
+                {eval: evaluator}
+              else
+                strat.to_sym
+              end
+            end
+          end
+
+          def evaluator
+            @evaluator ||= eval(arguments.get(:evaluator) || 'Gisture::Evaluator')
+          end
+
+          def filename
+            @filename ||= arguments.get(:filename)
+          end
+
+          def clone?
+            arguments.arg?(:clone)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/gisture/commands/repo/run.rb

@@ -7,16 +7,12 @@ module Gisture
         include Kommand::Commands::Command
 
         command_name 'repo:run'
-        command_summary "Run a repo file directly from the command line"
-        valid_argument Kommand::Scripts::Argument.new("-f, --filename", summary: "Specify a filename if it's not included in the repo URL")
-        valid_argument Kommand::Scripts::Argument.new("-s, --strategy", summary: "Execution strategy, defaults to 'eval'")
-        valid_argument Kommand::Scripts::Argument.new("-e, --evaluator", summary: "Use a custom evaluator class, only applies to 'eval' strategy")
-        valid_argument Kommand::Scripts::Argument.new("-c, --clone", summary: "Clone the repo into a local tmp path and run from that working dir")
+        command_summary "Run a yaml gisture directly from the command line"
         validate_arguments false
 
         class << self
           def usage
-            puts "usage: #{Kommand.kommand} #{command_name} GIST_ID_OR_URL #{valid_arguments.to_s}"
+            puts "usage: #{Kommand.kommand} #{command_name} YAML_GISTURE_URL #{valid_arguments.to_s}"
             unless valid_arguments.empty?
               puts
               puts "Arguments:"
@@ -26,22 +22,11 @@ module Gisture
         end
 
         def run
-          clone? ? repo.clone! : repo.destroy_clone!
-
-          result = file.run!
-
-          if strategy == :exec
-            puts result
-          else
-            result
-          end
+          repo.run!(repo_url[1])
         end
 
         protected
 
-        def file
-          @file ||= repo.file((repo_url[1] || filename), strategy: strategy)
-        end
 
         def repo
           @repo ||= Gisture.repo(repo_url[0])
@@ -53,29 +38,6 @@ module Gisture
           [Gisture::Repo.parse_repo_url(arguments.unnamed.first.value).join('/')]
         end
 
-        def strategy
-          @strategy ||= begin
-            strat = arguments.get(:strategy) || 'eval'
-            if strat == 'eval'
-              {eval: evaluator}
-            else
-              strat.to_sym
-            end
-          end
-        end
-
-        def evaluator
-          @evaluator ||= eval(arguments.get(:evaluator) || 'Gisture::Evaluator')
-        end
-
-        def filename
-          @filename ||= arguments.get(:filename)
-        end
-
-        def clone?
-          arguments.arg?(:clone)
-        end
-
       end
     end
   end

data/lib/gisture/file.rb

@@ -21,21 +21,21 @@ module Gisture
     end
 
     def require!(*args, &block)
-      Gisture.logger.info "[gisture] Running #{basename}/#{file.path || file.filename} via the :require strategy"
+      Gisture.logger.info "[gisture] Running #{::File.join(basename, (file.filename || file.path))} via the :require strategy"
       required = require tempfile.path
       unlink_tempfile
       block_given? ? yield : required
     end
 
     def load!(*args, &block)
-      Gisture.logger.info "[gisture] Running #{basename}/#{file.path || file.filename} via the :load strategy"
+      Gisture.logger.info "[gisture] Running #{::File.join(basename, (file.filename || file.path))} via the :load strategy"
       loaded = load tempfile.path
       unlink_tempfile
       block_given? ? yield : loaded
     end
 
     def eval!(*args, &block)
-      Gisture.logger.info "[gisture] Running #{basename}/#{file.path || file.filename} via the :eval strategy"
+      Gisture.logger.info "[gisture] Running #{::File.join(basename, (file.filename || file.path))} via the :eval strategy"
       args << Gisture::Evaluator
       klass = args.first
       evaluator = klass.new(file.content)
@@ -44,7 +44,7 @@ module Gisture
     end
 
     def exec!(*args, &block)
-      Gisture.logger.info "[gisture] Running #{basename}/#{file.path || file.filename} via the :exec strategy"
+      Gisture.logger.info "[gisture] Running #{::File.join(basename, (file.filename || file.path))} via the :exec strategy"
 
       # map nils to file path in args to allow easily inserting the filepath wherever
       # makes sense in your executable arguments (i.e. 'ruby', '-v', nil, '--script-arg')
@@ -81,6 +81,17 @@ module Gisture
       end
     end
 
+    def localize!(root)
+      @tempfile = begin
+        fname = ::File.join(root, (file.path || file.filename))
+        FileUtils.mkdir_p ::File.dirname(fname)
+        local_file = ::File.open(fname, 'w')
+        local_file.write(file.content)
+        local_file.close
+        local_file
+      end
+    end
+
     def extname
       @extname ||= ::File.extname(file.filename)
     end

data/lib/gisture/repo.rb

@@ -3,6 +3,7 @@ module Gisture
     attr_reader :owner, :project
     REPO_URL_REGEX = /\A((http[s]?:\/\/)?github\.com\/)?([a-z0-9_\-\.]*)\/([a-z0-9_\-\.]*)\/?\Z/i
     FILE_URL_REGEX = /\A((http[s]?:\/\/)?github\.com\/)?(([a-z0-9_\-\.]*)\/([a-z0-9_\-\.]*))(\/[a-z0-9_\-\.\/]+)\Z/i
+    GISTURE_FILE_REGEX = /\A(gisture\.ya?ml|.+\.gist|.+\.gisture)\Z/ # gisture.yml, gisture.yaml, whatever.gist, whatever.gisture
 
     class << self
       def file(path, strategy: nil)
@@ -44,9 +45,67 @@ module Gisture
       end
     end
 
-    def run!(path, strategy: nil, &block)
-      file(path, strategy: strategy).run!(&block)
+    def files(path)
+      if cloned?
+        Dir[::File.join(clone_path, path, '*')].map { |f| Hashie::Mash.new({name: ::File.basename(f), path: ::File.join(path, ::File.basename(f))}) }
+      else
+        github.repos.contents.get(user: owner, repo: project, path: path).body
+      end
+    end
+
+    # TODO move all the gisture/gisticulate stuff into a separate class (Gisture? Gisticulation?)
+
+    def gistures(path)
+      if ::File.basename(path).match(GISTURE_FILE_REGEX)
+        [Hashie::Mash.new(YAML.load(file(path).content).symbolize_keys)]
+      else
+        files(path).select { |f| f.name.match(GISTURE_FILE_REGEX) }.map { |f| Hashie::Mash.new(YAML.load(file(f.path).content).symbolize_keys) }
+      end
+    end
+
+    def gisticulate(gisture, &block)
+      if gisture.key?(:gistures) || gisture.key?(:gists)
+        gists = (gisture[:gistures] || gisture[:gists])
+        gists = gists.values if gists.respond_to?(:values)
+        clone! if gists.any? { |g| g[:clone] == true } # force clone once up front for a refresh
+        gists.map { |gist| gisticulate(gist, &block) }
+      else
+        clone if gisture[:clone] == true
+
+        run_options = []
+        run_options << eval(gisture[:evaluator]) if (!gisture.key?(:strategy) || gisture[:strategy].to_sym == :eval) && gisture.key?(:evaluator)
+        run_options = gisture[:executor] if (gisture.key?(:strategy) && gisture[:strategy].to_sym == :exec) && gisture.key?(:executor)
+
+        if gisture[:resources] && !cloned?
+          # localize and pull down any relevant resources
+          gisture[:resources].each do |resource|
+            Gisture.logger.info "[gisture] Localizing resource #{::File.join(owner, project, resource)} into #{clone_path}"
+            file(resource).localize!(clone_path)
+          end
+
+          # localize the file we're running
+          Gisture.logger.info "[gisture] Localizing gisture #{::File.join(owner, project, gisture[:path])} into #{clone_path}"
+          gfile = file(gisture[:path], strategy: gisture[:strategy])
+          gfile.localize!(clone_path)
+
+          # chdir into the localized temp path
+          cwd = Dir.pwd
+          Dir.chdir ::File.dirname(gfile.tempfile.path)
+          result = gfile.run!(*run_options, &block)
+          Dir.chdir cwd
+          result
+        else
+          file(gisture[:path], strategy: gisture[:strategy]).run!(*run_options, &block)
+        end
+      end
+    end
+
+    def run(path, &block)
+      gists = gistures(path)
+      clone! if gists.any? { |g| g[:clone] == true } # force clone once up front for a refresh
+      gists.map { |g| gisticulate(g, &block) }
     end
+    alias_method :run!, :run
 
     def clone_path
       @clone_path ||= ::File.join(Gisture.configuration.tmpdir, owner, project)

data/lib/gisture/version.rb

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

data/lib/tasks/gisture.rake

@@ -8,10 +8,17 @@ namespace :gisture do
   end
 
   namespace :repo do
-    desc 'Run a file from a github repo in a rake task'
-    task :run, [:repo, :filename, :strategy, :runner] => :environment do |t,args|
-      runner = Proc.new { eval(args.runner.to_s) }
-      Gisture.repo(args.repo).file(args.filename, strategy: args.strategy).run!(&runner)
+    desc 'Run a yaml gisture from a github repo in a rake task'
+    task :run, [:repo, :yaml_file] => :environment do |t,args|
+      Gisture.repo(args.repo).run!(args.yaml_file)
+    end
+
+    namespace :file do
+      desc 'Run a file from a github repo in a rake task'
+      task :run, [:repo, :filename, :strategy, :runner] => :environment do |t,args|
+        runner = Proc.new { eval(args.runner.to_s) }
+        Gisture.repo(args.repo).file(args.filename, strategy: args.strategy).run!(&runner)
+      end
     end
   end
 end

data/spec/gists/array.gist

@@ -0,0 +1,7 @@
+gists:
+  - path: spec/gists/simple.rb
+    strategy: eval
+  - path: spec/gists/method.rb
+    strategy: load
+  - path: spec/gists/class.rb
+    strategy: require

data/spec/gists/class.gist

@@ -0,0 +1,4 @@
+path: /spec/gists/class.rb
+strategy: require
+evaluator: "Gisture::Evaluator"
+clone: true

data/spec/gists/gisture.yml

@@ -0,0 +1,5 @@
+path: /spec/gists/simple.rb
+strategy: eval
+evaluator: "Gisture::Evaluator"
+executor: ['ruby', '-v']
+clone: true

data/spec/gists/method.gisture

@@ -0,0 +1,3 @@
+path: /spec/gists/method.rb
+strategy: eval
+clone: false

data/spec/gists/multi.gist

@@ -0,0 +1,10 @@
+gistures:
+  simple:
+    path: spec/gists/simple.rb
+    strategy: eval
+  method:
+    path: spec/gists/method.rb
+    strategy: load
+  class:
+    path: spec/gists/class.rb
+    strategy: require

data/spec/gists/resourceful.gist

@@ -0,0 +1,4 @@
+path: spec/gists/resourceful.rb
+resources:
+  - spec/gists/resourceful.txt
+  - lib/gisture/version.rb

data/spec/gists/resourceful.rb

@@ -0,0 +1,2 @@
+puts ::File.read('./resourceful.txt')
+puts ::File.read('../../lib/gisture/version.rb')

data/spec/gists/resourceful.txt

@@ -0,0 +1 @@
+This is the content of resourceful.txt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gisture
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canfig
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,7 @@ files:
 - lib/gisture/cloned_file.rb
 - lib/gisture/commands.rb
 - lib/gisture/commands/gist/run.rb
+- lib/gisture/commands/repo/file/run.rb
 - lib/gisture/commands/repo/run.rb
 - lib/gisture/errors.rb
 - lib/gisture/evaluator.rb
@@ -119,10 +134,18 @@ files:
 - lib/gisture/repo_file.rb
 - lib/gisture/version.rb
 - lib/tasks/gisture.rake
+- spec/gists/array.gist
 - spec/gists/called_class.rb
 - spec/gists/called_method.rb
+- spec/gists/class.gist
 - spec/gists/class.rb
+- spec/gists/gisture.yml
+- spec/gists/method.gisture
 - spec/gists/method.rb
+- spec/gists/multi.gist
+- spec/gists/resourceful.gist
+- spec/gists/resourceful.rb
+- spec/gists/resourceful.txt
 - spec/gists/simple.rb
 - spec/gisture/evaluator_spec.rb
 - spec/gisture/file_spec.rb
@@ -156,10 +179,18 @@ signing_key:
 specification_version: 4
 summary: Execute one-off gists inline or in the background.
 test_files:
+- spec/gists/array.gist
 - spec/gists/called_class.rb
 - spec/gists/called_method.rb
+- spec/gists/class.gist
 - spec/gists/class.rb
+- spec/gists/gisture.yml
+- spec/gists/method.gisture
 - spec/gists/method.rb
+- spec/gists/multi.gist
+- spec/gists/resourceful.gist
+- spec/gists/resourceful.rb
+- spec/gists/resourceful.txt
 - spec/gists/simple.rb
 - spec/gisture/evaluator_spec.rb
 - spec/gisture/file_spec.rb