canvas-workflow 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4776993ecddc6700c7ada9b4219877137866df237762eafc2d1c32d0e1320cd2
-  data.tar.gz: 59a259dfbba4cd751c62b3df9c8422e17dab2a2af8f76ad130f78bf0548474b4
+  metadata.gz: 0d6eca2df23be413bc70fce4013c32e8a33727a309d8fc93b065575865663e24
+  data.tar.gz: 840966af55829acc2af8e6853fb39a194904e9be776d551a328560a4c02fd3b7
 SHA512:
-  metadata.gz: 80fa795db4d8087402688e6ecefb6b38faa04e278d8ed0180674f40d81142d9256c44e2715814128f3bbd4fb271eb7026d98ce49302dd78ddb9f5c5442b3dcc6
-  data.tar.gz: 90bc64fdb497861414f74318832e31dc114e508f1d43fa9cb65d9b37540924c57218f77badbe368af9585881fb80166c29730bf38ccc6b3e15e256822ba7fcd1
+  metadata.gz: 54e7cf140bb34011498b48f98a2adcc62976515c79d1f1264ce8429c2e21ab1e38902d6fcc703496be6052fa9fc037e10a1945e050fefba7c2a26bc0de276aca
+  data.tar.gz: 6e129630ae936d3d8bb60bee24ecbd6427074cec94eab51ca4c334c25bd70b401d5425eec6643de0de1afc55bae27e89842755f6a4c9bcc044380da826fcd70a

data/.yardopts

@@ -0,0 +1,3 @@
+--tag bug:"Known bugs"
+--tag internal
+--hide-tag internal

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.7.0](https://github.com/jiverson002/canvas-workflow/releases/tag/0.7.0)
+
+### Enhancements
+* Change subcommand jekyll build => build, to abstract what tool is being used
+  to build.
+
+## [0.6.0](https://github.com/jiverson002/canvas-workflow/releases/tag/0.6.0)
+* Yanked.
+
 ## [0.5.0](https://github.com/jiverson002/canvas-workflow/releases/tag/0.5.0)
 * Renamed project to canvas-workflow.
 * Incorporated canvas-workflow-travis into this project.

data/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# group :runtime
+gemspec
+
+group :test do
+  gem "rspec", "~>3.7"
+  gem "webmock", "~>3.3"
+end

data/bin/canvas

@@ -2,4 +2,13 @@
 
 require 'canvas-workflow'
 
-Canvas::Workflow::CLI.start(ARGV)
+file = "/tmp/canvas-workflow"
+
+exit(false) if File.exist?(file)
+
+begin
+  Canvas::Workflow::CLI.start(ARGV)
+rescue Canvas::Workflow::CLI::Error => e
+  File.write(file, e.exitstatus.to_s)
+  exit(e.exitstatus)
+end

data/lib/canvas/workflow/cli/build.rb

@@ -0,0 +1,30 @@
+module Canvas
+  module Workflow
+    module CLI
+      class Build < Thor
+        desc "build", "Build the Canvas Workflow project"
+        option :with_bundler, :aliases => :b,
+          :type => :boolean, :default => false,
+          :desc => "build using bundler?"
+        def build
+          config = File.expand_path("../../../../../_config.yml", __FILE__)
+
+          cmd = ""
+          cmd << "bundle exec " if options[:with_bundler]
+          cmd << "jekyll build --config #{config},_config.yml --verbose"
+          #puts "#{cmd}"
+          ret = system("#{cmd}")
+          raise Error.new($?.exitstatus) if (ret.nil? || ret == false)
+        end
+
+        default_task :build
+      end
+
+      desc "build", "Manage static site generator"
+      subcommand "build", Build
+    end
+  end
+end
+
+# Canvas::Workflow::CLI.desc "build", "Manage static site generator"
+# Canvas::Workflow::CLI.subcommand "build", Canvas::Workflow::CLI::Build

data/lib/canvas/workflow/cli/error.rb

@@ -0,0 +1,15 @@
+module Canvas
+  module Workflow
+    module CLI
+      class Error < StandardError
+        def initialize(exitstatus)
+          @exitstatus = exitstatus
+        end
+
+        def exitstatus
+          @exitstatus
+        end
+      end
+    end
+  end
+end

data/lib/canvas/workflow/travis.rb

@@ -33,7 +33,7 @@ module Canvas
           # get the list of files that have been deleted since the last passed
           # commit
           @removed ||= `git diff --diff-filter=D --name-only #{commit_sha}`
-          exit($?.exitstatus) if $?.exitstatus != 0
+          raise Error.new($?.exitstatus) if $?.exitstatus != 0
         end
 
         # check if the param file has been removed
@@ -58,7 +58,7 @@ module Canvas
           # commit
           @created ||= `git diff --diff-filter=AR --name-only #{commit_sha}`
         end
-        exit($?.exitstatus) if $?.exitstatus != 0
+        raise Error.new($?.exitstatus) if $?.exitstatus != 0
 
         # check if the param file has been created
         @created.include?(file)
@@ -82,7 +82,7 @@ module Canvas
           # passed commit
           @modified ||= `git diff --diff-filter=M --name-only #{commit_sha}`
         end
-        exit($?.exitstatus) if $?.exitstatus != 0
+        raise Error.new($?.exitstatus) if $?.exitstatus != 0
 
         # check if the param file has been modified
         @modified.include?(file)

data/lib/canvas/workflow/version.rb

@@ -2,6 +2,6 @@
 
 module Canvas
   module Workflow
-    VERSION = "0.5.0".freeze
+    VERSION = "0.7.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas-workflow
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeremy Iverson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -116,20 +102,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
+- _config.yml
 - _includes/newline
 - _layouts/assignment.html
 - _layouts/page.html
 - _layouts/syllabus.html
-- assets/_config.yml
 - bin/canvas
 - lib/canvas-workflow.rb
 - lib/canvas/workflow.rb
 - lib/canvas/workflow/cli.rb
+- lib/canvas/workflow/cli/build.rb
 - lib/canvas/workflow/cli/deploy.rb
-- lib/canvas/workflow/cli/jekyll.rb
+- lib/canvas/workflow/cli/error.rb
 - lib/canvas/workflow/cli/push.rb
 - lib/canvas/workflow/client.rb
 - lib/canvas/workflow/pandarus.rb

data/lib/canvas/workflow/cli/jekyll.rb

@@ -1,28 +0,0 @@
-module Canvas
-  module Workflow
-    module CLI
-      class Jekyll < Thor
-        desc "build", "Build the Canvas Workflow project"
-        option :with_bundler, :aliases => :b,
-          :type => :boolean, :default => false,
-          :desc => "build using bundler?"
-        def build
-          assets = File.expand_path("../../../../../assets", __FILE__)
-          asset  = File.join(assets, "_config.yml")
-
-          cmd = ""
-          cmd << "bundle exec " if options[:with_bundler]
-          cmd << "jekyll build --config #{asset},_config.yml --verbose"
-          #puts "#{cmd}"
-          exec("#{cmd}")
-        end
-      end
-
-      desc "jekyll SUBCOMMAND ...ARGS", "Manage static site generator"
-      subcommand "jekyll", Jekyll
-    end
-  end
-end
-
-# Canvas::Workflow::CLI.desc "jekyll SUBCOMMAND ...ARGS", "Manage static site generator"
-# Canvas::Workflow::CLI.subcommand "jekyll", Canvas::Workflow::CLI::Jekyll