cid 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmU0ZTUwYjBlNGY2M2M1YTMwYzllNjhlMWJhZjE3OWZjMmM4ZTVlMw==
+    NWE5MjE3MDc5N2RmYmYxYzVkMWI0MWZmZmUwM2I5ODhkOTg2NGUxZQ==
   data.tar.gz: !binary |-
-    ZGUxYzBmODUyMWQ1MjRkYjM1YzNhMzNjNzFiNjA1M2Y4YjFkMDkyZA==
+    NDc4NzgwNWMyMzRhYzVjYjBkMmQ0ZDYxZjgxNjkzMjI3ZTFmMjVhNA==
 SHA512:
   metadata.gz: !binary |-
-    YTg5MGExZDBjZDdiYzc2NTI5MDZkOWJiMTNjMDI3ZTFlZDAxNzI1MTc3MGVj
-    YjIwOTQwNWIwYTU0ZjRiYzk5N2NhMDFhNDMwNmRmYWJhODRiMDNlNjNiODEy
-    NGFlNmU2NzExMzM3MmEzNjJkNTU2NGZjMDYyNWJkYmRkYmFiMmY=
+    NDQzZjMwYzM4NWVjYjQ4YmQzYWY0Y2Y5OTQzNGVhMzAyYTJiYmE1NjljYjNl
+    YWM5ZGIzMjg3YmM2NzM5NGJlZTUyNGRhNzI2NTkwMmZmMDk0OGQzZjYzMGFh
+    MmI0Y2JlYzM4MTQ2NjM1ZjM0YTVmOTczMGY2MTY0YmEwY2QwMDU=
   data.tar.gz: !binary |-
-    ZTJhZmEyYTFjN2M2MGQ5NWY3YzhhMDVlN2M0MDdhODQwOGVlOGY0NzFmZGU2
-    N2RmZDdlOTU5M2NiOTYyZmE5MWFhZGQ1MjEzNzc4ZGMzYzY0NjdiZGVmNGI5
-    YmUyZDk4ZDg5MDk2YWE3YjBhNmNhNzFkZjdiNzMzYTJhNmNlYWM=
+    NGIyMTdlMDkyZWI0MGIzODIyMmQ5OTNhM2RmNzRmOWUxYjU1YTBkYzA2Mzkx
+    M2MwMzc2ODRkNGFhZjZmODU1ODMyMGY4OTI3MTMwOTRhOGI1ZjhlMTdhMmUy
+    NGI2YmU2MDkzOTI5MTY2YTZhNmJhOTIyMWQxZTc5YjhkMmYzODM=

data/.travis.yml

@@ -19,3 +19,4 @@ deploy:
   on:
     tags: true
     repo: theodi/cid
+    all_branches: true

data/README.md

@@ -65,7 +65,26 @@ If you just want to skip the GitHub push altogether, just run
 
 ## Getting this in Travis
 
-Obviously, Cid is at its most powerful when used in a CI build. To get Cid working in Travis, simply add a `.travis.yml` file to your repo that looks a bit like this:
+Obviously, Cid is at its most powerful when used in a CI build. To get Cid working in Travis, simply run:
+
+  cid bootstrap --github-token=YOUR_TOKEN_HERE
+
+This will create a `.travis.yml` to your repo and add your encrypted Github key.
+
+Then just add your repo to Travis, and push your changes.
+
+Now whenever someone makes a pull request on your data, Cid will validate the
+data against the schema, and you'll get a nice build status telling you if it's good to go!
+
+If the branch is master, it will also generate a new `datapackage.json` and push that to Github.
+
+If you would rather generate the `datapackage.json` on a different branch (for example, `gh-pages`),
+simply add the option `branch` like so:
+
+  cid bootstrap --github-token=YOUR_TOKEN_HERE --branch=gh-pages
+
+You can also do this manually if you prefer - simply add a `.travis.yml` file to your repo
+that looks a bit like this:
 
 	before_script:
 		- gem install cid
@@ -74,17 +93,10 @@ Obviously, Cid is at its most powerful when used in a CI build. To get Cid worki
 	after_success:
 		- '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && cid publish'
 
-This installs cid, runs the validation, and then (if the branch is master) generates a new `datapackage.json` and pushes it to github.
-
 You'll also need to add your Github token to the `.travis.yml` file. To do this, just run:
 
-	gem install travis
 	travis encrypt GITHUB_OAUTH_TOKEN="YOUR_TOKEN_HERE" --add
 
-Then just add your repo to Travis, and push your changes.
-
-Now whenever someone makes a pull request on your data, Cid will validate the data against the schema, and you'll get a nice build status telling you if it's good to go!
-
 ## Examples
 
 There's only two repos that use Cid so far (it is a new thing after all), and you can see it here:

data/Rakefile

@@ -11,7 +11,8 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 Coveralls::RakeTask.new
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format pretty"
+  tags = "--tags ~@skip-ci" if ENV['TRAVIS']
+  t.cucumber_opts = "features --format pretty #{tags}"
 end
 
 task :default => [:spec, :features, 'coveralls:push']

data/bin/cid

@@ -7,6 +7,22 @@ require 'thor'
 
 class CidBin < Thor
 
+  desc "bootstrap", "sets up your .travis.yml"
+  long_desc <<-LONGDESC
+    `cid bootstrap` will populate your repo's `.travis.yml` file.
+  LONGDESC
+  option :branch, :type => :string, :desc => "The branch you want to deploy from (default is master)"
+  option :github_token, :type => :string, :desc => "Your Github Oauth Token"
+  def bootstrap
+    branch = options[:branch] || "master"
+    travis = Cid::Bootstrap.new(:branch => branch, :github_token => options[:github_token])
+    travis.perform
+    if travis.no_remote === true
+      puts "Warning: Can't figure out GitHub repo name. Please ensure your directory contains a Github remote".colorize(:red)
+    end
+    puts "Cid sucessfully bootstrapped!".colorize(:green)
+  end
+
   desc "validate PATH", "validate a package"
   long_desc <<-LONGDESC
     `cid validate` will validate a datapackage containing CSVs and schemas.

data/cid.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dotenv"
   spec.add_dependency "memoist"
   spec.add_dependency "thor"
+  spec.add_dependency "travis"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
@@ -37,5 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "spork"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "aruba-doubles"
 
 end

data/features/bootstrap.feature

@@ -0,0 +1,42 @@
+@bootstrap @inprocess
+Feature: Bootstrap .travis.yml file
+
+  Scenario: Create a .travis.yml file
+    Given I run `cp -r ../../spec/fixtures/valid valid`
+    And I cd to "valid"
+    When I run `cid bootstrap`
+    And I run `cat .travis.yml`
+    Then the output should contain:
+      """
+      ---
+      before_script: gem install cid
+      script: cid validate
+      after_success: '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && cid publish'
+
+      """
+
+  Scenario: Specify different branch
+    Given I run `cp -r ../../spec/fixtures/valid valid`
+    And I cd to "valid"
+    When I run `cid bootstrap --branch=gh-pages`
+    And I run `cat .travis.yml`
+    Then the output should contain "gh-pages"
+
+  @skip-ci
+  Scenario: Create a .travis.yml file with a Github token
+    Given I run `git clone https://github.com/theodi/cid-test.git`
+    And I cd to "cid-test"
+    And I run `rm .travis.yml`
+    When I run `cid bootstrap --github-token=foobarbaz`
+    Then the output should not contain "Can't figure out GitHub repo name."
+    And I run `cat .travis.yml`
+    Then the output should contain "secure:"
+
+  @skip-ci
+  Scenario: Not in a repo with a Github remote
+    Given I run `mkdir no-remote && cd no-remote`
+    And I set up a new git repo
+    And I run `cid bootstrap --github-token=foobarbaz`
+    Then the output should contain "Can't figure out GitHub repo name."
+    And I run `cat .travis.yml`
+    Then the output should not contain "secure:"

data/features/support/env.rb

@@ -19,7 +19,7 @@ Before('@validate') do
   @dirs = ["#{File.dirname(__FILE__)}/../.."]
 end
 
-After('@publish') do
+After('@publish, @bootstrap') do
   `rm -rf tmp/aruba/`
 end
 

data/lib/cid.rb

@@ -3,6 +3,9 @@ module Cid
   module Helpers
   end
 
+  class Bootstrap
+  end
+
 end
 
 require "cid/helpers/github"
@@ -11,3 +14,4 @@ require "cid/version"
 require "cid/validation"
 require "cid/datapackage"
 require "cid/publish"
+require "cid/bootstrap"

data/lib/cid/bootstrap.rb

@@ -0,0 +1,40 @@
+module Cid
+  class Bootstrap
+
+    attr_accessor :no_remote
+
+    def initialize(options)
+      @branch = options[:branch]
+      @github_token = options[:github_token]
+    end
+
+    def perform
+      write
+      if @github_token
+        encrypt_token
+      end
+    end
+
+    def encrypt_token
+      output = `travis encrypt GITHUB_OAUTH_TOKEN=#{@github_token} --add`
+      no_remote = true if output.match /Can't figure out GitHub repo name/
+    end
+
+    def write
+      File.write(travis_yaml, yaml_string)
+    end
+
+    def travis_yaml(dir = Dir.pwd)
+      path = File.expand_path('.travis.yml', dir)
+    end
+
+    def yaml_string
+      {
+        'before_script' => 'gem install cid',
+        'script' => 'cid validate',
+        'after_success' => "[ \"$TRAVIS_BRANCH\" == \"#{@branch}\" ] && [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ] && cid publish"
+      }.to_yaml(options = {line_width: -1})
+    end
+
+  end
+end

data/lib/cid/version.rb

@@ -1,3 +1,3 @@
 module Cid
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - pezholio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csvlint
@@ -122,6 +122,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: travis
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +290,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba-doubles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - pezholio@gmail.com
@@ -292,11 +320,13 @@ files:
 - Rakefile
 - bin/cid
 - cid.gemspec
+- features/bootstrap.feature
 - features/publish.feature
 - features/step_definitions/cid.rb
 - features/support/env.rb
 - features/validate.feature
 - lib/cid.rb
+- lib/cid/bootstrap.rb
 - lib/cid/datapackage.rb
 - lib/cid/helpers/github.rb
 - lib/cid/publish.rb
@@ -354,6 +384,7 @@ signing_key:
 specification_version: 4
 summary: Tools to allow continuous integration when collaborating on data in Github
 test_files:
+- features/bootstrap.feature
 - features/publish.feature
 - features/step_definitions/cid.rb
 - features/support/env.rb