diff --git a/Gemfile.lock b/Gemfile.lock index 4c7cad6..46c7e68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,11 +11,11 @@ PATH GEM remote: http://rubygems.org/ specs: - activemodel (3.0.10) - activesupport (= 3.0.10) + activemodel (3.0.12) + activesupport (= 3.0.12) builder (~> 2.1.2) i18n (~> 0.5.0) - activesupport (3.0.10) + activesupport (3.0.12) adapter (0.5.2) adapter-git (0.5.0) adapter (~> 0.5.1) @@ -68,6 +68,8 @@ GEM mime-types (1.16) nokogiri (1.5.0) rack (1.3.2) + rack-protection (1.2.0) + rack rack-test (0.6.1) rack (>= 1.0) rake (0.9.2) @@ -96,26 +98,27 @@ GEM ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) rubyzip (0.9.4) - sass (3.1.7) + sass (3.1.15) selenium-webdriver (2.4.0) childprocess (>= 0.2.1) ffi (>= 1.0.7) json_pure rubyzip simple_uuid (0.1.2) - sinatra (1.2.6) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sprockets (2.0.0) + sinatra (1.3.0) + rack (~> 1.3) + rack-protection (~> 1.1) + tilt (~> 1.3) + sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) term-ansicolor (1.0.6) thor (0.14.6) tilt (1.3.3) - toystore (0.8.2) - activemodel (~> 3.0) - activesupport (~> 3.0) + toystore (0.9.0) + activemodel (~> 3.0, < 3.2) + activesupport (~> 3.0, < 3.2) adapter (~> 0.5.1) simple_uuid (~> 0.1.1) xpath (0.1.4) diff --git a/lib/gaskit/story.rb b/lib/gaskit/story.rb index f8ea227..13c1647 100644 --- a/lib/gaskit/story.rb +++ b/lib/gaskit/story.rb @@ -3,7 +3,7 @@ class Story include Toy::Store self.include_root_in_json = false - store :git, Gaskit.repo, :branch => 'gaskit', :path => 'stories' + adapter :git, Gaskit.repo, :branch => 'gaskit', :path => 'stories' attribute :description, String attribute :type, String, :default => 'feature' @@ -32,9 +32,9 @@ def type=(type) private def self.contents - head = store.head + head = adapter.head - if head && tree = head.commit.tree / store.options[:path] + if head && tree = head.commit.tree / adapter.options[:path] tree.contents else []