chemistrykit 2.0.0 → 2.1.0

data/.ruby-gemset

@@ -0,0 +1 @@
+chemistrykit

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p429

data/CHANGELOG.md

@@ -1,7 +1,19 @@
+#2.1.0 (2013-06-28)
+- Updated documentation for #62 release process.
+- Bumped version to 2.1.0 to prepare for release.
+- Changed the oder of branch updates in rakefile #62
+- #62 fixed another small issue with rakefile
+- fixed small typo in Rakefile per #62
+- updated a note to the change log and built out the rake tasks to close #62
+- updated gemspec to remove the ext, cleaned up the base class.
+-  updated rvm version files and removed the ext directory
+- moved the build dir deletion to the before so that post test inspection could be carried out, also added a rough implementation to close #63
+
 #2.0.0 (2013-06-27)
 - Updated to Selenium-Connect version to 2.0.0
 - Improved performance with driver hooks
 - Added the ability to specify config files on brew.
+- NOTE: Updated default config file from `_config.yaml` to `config.yaml`
 - Added the "catalyst" concept for injecting data into formulas.
 
 #1.3.0 (2013-06-22)

data/README.md

@@ -56,3 +56,14 @@ All issues and questions related to this project should be logged using the [git
 ### Run the local version of the executable:
 
     ckit
+
+##Releaseing
+The release process is rather automated, just use one rake task with the new version number:
+
+    rake release_start['2.1.0']
+
+And another to finish the release:
+
+    rake release_finish['A helpful tag message that will be included in the gemspec.']
+
+This handles updating the change log, committing, and tagging the release.

data/Rakefile

@@ -23,3 +23,97 @@ end
 RSpec::Core::RakeTask.new(:spec)
 
 Cucumber::Rake::Task.new(:cucumber)
+
+
+#TODO This could probablly be more cleanly automated
+desc 'Start a release (Requires Git Flow)'
+task :release_start, :version do |t, args|
+  version = args['version']
+
+  #make sure we have the latest stuff
+  system "git fetch --all"
+
+  #first make sure master is checked out and up to date
+  system "git checkout master"
+  system "git pull --no-edit origin master"
+
+  #then make sure develop is up to date
+  system "git checkout develop"
+  system "git pull --no-edit origin develop"
+
+  #next assure all the tests run
+  task(:build).invoke
+
+  #start the release process
+  system "git flow release start #{version}"
+
+  #update the version number in the .gemspec file
+  gemspec = File.join(Dir.getwd, 'chemistrykit.gemspec')
+  updated = File.read(gemspec).gsub(/s.version(\s+)=(\s?["|']).+(["|'])/){
+    "s.version#{$1}=#{$2}#{version}#{$3}"
+  }
+  File.open(gemspec, 'w'){ |f| f.write(updated) }
+
+  #commit the version bump
+  system "git add chemistrykit.gemspec"
+  system "git commit -m 'Bumped version to #{version} to prepare for release.'"
+
+  puts "You've started release #{version}, make any last minute updates now.\n"
+end
+
+#TODO This could probablly be more cleanly automated
+desc 'Finish a release (Requires Git Flow and Gem Deploy Permissions'
+task :release_finish, :update_message do |t, args|
+  message   = args['update_message']
+  gemspec   = File.join(Dir.getwd, 'chemistrykit.gemspec')
+  changelog = File.join(Dir.getwd, 'CHANGELOG.md')
+  version   = File.read(gemspec).match(/s.version\s+=\s?["|'](.+)["|']/)[1]
+
+  ###Changelog
+  #get the latest tag
+  last_tag = `git describe --abbrev=0`
+  #get the commit hash since the last that version was merged to develop
+  hash = `git log --grep="Merge branch 'release/#{last_tag.chomp}' into develop" --format="%H"`
+  #get all the commits since them less merges
+  log = `git log --format="- %s" --no-merges #{hash.chomp}..HEAD`
+
+  changelog_contents = File.read(changelog)
+  date = Time.new.strftime("%Y-%m-%d")
+  #create the new heading
+  updated_changelog = "##{version} (#{date})\n" + log + "\n" + changelog_contents
+  #update the contents
+  File.open(changelog, 'w'){ |f| f.write(updated_changelog) }
+  puts "Updated change log for version #{version}\n"
+
+  ###Update the gemspec with the message
+  updated_gemspec = File.read(gemspec).gsub(/s.description(\s+)=(\s?["|']).+(["|'])/){
+    "s.description#{$1}=#{$2}#{message}#{$3}"
+  }
+  File.open(gemspec, 'w'){ |f| f.write(updated_gemspec) }
+
+  #Commit the updated change log and gemspec
+  system "git commit -am 'Updated CHANGELOG.md and gemspec for #{version} release.'"
+
+  #build the gem
+  system "gem build chemistrykit.gemspec"
+
+  #push the gem
+  system "gem push chemistrykit-#{version}.gem"
+
+  #remove the gem file
+  system "rm chemistrykit-#{version}.gem"
+
+  #finish the release
+  system "git flow release finish -m '#{message}' #{version}"
+
+  #push develop
+  system "git push origin develop"
+
+  #push master
+  system "git push origin master"
+
+  #push tags
+  system "git push --tags"
+
+  puts "Rock and roll, you just released ChemistryKit #{version}!\n"
+end

data/chemistrykit.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name          = "chemistrykit"
-  s.version       = "2.0.0"
+  s.version       = "2.1.0"
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Dave Haeffner", "Jason Fox"]
   s.email         = ["dave@arrgyle.com", "jason@arrgyle.com"]
   s.homepage      = "https://github.com/arrgyle/chemistrykit"
   s.summary       = "A simple and opinionated web testing framework for Selenium that follows convention over configuration."
-  s.description   = "Added catalyst data injection, multiple configuration usage, improved perfomrance."
+  s.description   = "Automated build process"
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
@@ -28,6 +28,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "aruba", "~> 0.5.1"
   s.add_development_dependency "cucumber", "~> 1.2.1"
   s.add_development_dependency "rake", "~> 10.0.3"
-
-  s.extensions = 'ext/mkrf_conf.rb'
 end

data/features/brew.feature

@@ -58,3 +58,24 @@ Feature: Brewing a ChemistryKit project
       """
     When I run `ckit brew`
     Then the stdout should contain "1 example, 0 failures"
+
+  Scenario: Brew a single beaker
+    Given a file named "config.yaml" with:
+      """
+      jar: '../../../vendor/selenium-server-standalone-2.33.0.jar'
+      log: 'evidence'
+      host: 'localhost'
+      """
+    And a file named "beaker/other_beaker.rb" with:
+      """
+      describe "Other", :depth => 'shallow' do
+        let(:book) { Formulas::Bookie.new(@driver) }
+
+        it "loads an external web page" do
+          book.open "http://www.google.com"
+        end
+      end
+      """
+    When I run `ckit brew --beaker=beaker/other_beaker.rb`
+    Then the stdout should contain "1 example, 0 failures"
+

data/features/support/env.rb

@@ -1,10 +1,7 @@
 require 'aruba/cucumber'
 
 Before do
+  FileUtils.rm_rf("build/tmp")
   @aruba_timeout_seconds = 90
   @dirs = ["build/tmp"]
 end
-
-After do
-  FileUtils.rm_rf("build/tmp")
-end

data/lib/chemistrykit/cli/cli.rb

@@ -29,6 +29,9 @@ module ChemistryKit
       method_option :params, :type => :hash
       method_option :tag, :default => ['depth:shallow'], :type => :array
       method_option :config, :default => 'config.yaml', :aliases => "-c", :desc => "Supply alternative config file."
+      #TODO there should be a facility to simply pass a path to this command
+      method_option :beaker, :type => :string
+
       def brew
         load_config
         require 'chemistrykit/shared_context'
@@ -38,7 +41,12 @@ module ChemistryKit
         load_page_objects
         setup_tags
         rspec_config
-        run_rspec
+
+        if options['beaker']
+          run_rspec([options['beaker']])
+        else
+          run_rspec(Dir.glob(File.join(Dir.getwd)))
+        end
       end
 
       protected
@@ -95,8 +103,11 @@ module ChemistryKit
         end
       end
 
-      def run_rspec
-        RSpec::Core::Runner.run(Dir.glob(File.join(Dir.getwd)))
+      def run_rspec(beakers)
+
+        #puts single_beaker.inspect
+
+        RSpec::Core::Runner.run(beakers)
       end
 
     end

data/lib/chemistrykit/formula/base.rb

@@ -12,10 +12,6 @@ module ChemistryKit
         self.catalyst = ChemistryKit::Catalyst.new(path_to_file)
       end
 
-      def catalyst
-        @catalyst
-      end
-
     end #Base
   end #Formula
 end #ChemistryKit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chemistrykit
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -172,19 +172,19 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-description: Added catalyst data injection, multiple configuration usage, improved
-  perfomrance.
+description: Automated build process
 email:
 - dave@arrgyle.com
 - jason@arrgyle.com
 executables:
 - ckit
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTORS.md
@@ -195,7 +195,6 @@ files:
 - TODO.md
 - bin/ckit
 - chemistrykit.gemspec
-- ext/mkrf_conf.rb
 - features/brew.feature
 - features/catalyst.feature
 - features/exit_status.feature
@@ -246,6 +245,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3509311149288293585
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/ext/mkrf_conf.rb

@@ -1,22 +0,0 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb'
-require 'rbconfig'
-
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-end 
-
-inst = Gem::DependencyInstaller.new
-begin
-  if RbConfig::CONFIG['host_os'] =~ /mswin|win|mingw/
-    inst.install  "win32-dir", "~> 0.4.1"
-  end
-rescue
-  exit(1)
-end 
-
-f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
-f.write("task :default\n")
-f.close