RubyGems - thor - Versions diffs - 0.16.0 → 0.17.0 - Mend

thor 0.16.0 → 0.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

data/.rspec +1 -0
data/.travis.yml +2 -1
data/CHANGELOG.rdoc +8 -0
data/Gemfile +12 -8
data/lib/thor.rb +79 -10
data/lib/thor/actions.rb +13 -13
data/lib/thor/actions/directory.rb +29 -10
data/lib/thor/actions/file_manipulation.rb +8 -2
data/lib/thor/base.rb +24 -11
data/lib/thor/core_ext/hash_with_indifferent_access.rb +5 -0
data/lib/thor/group.rb +5 -5
data/lib/thor/parser/options.rb +63 -25
data/lib/thor/rake_compat.rb +3 -2
data/lib/thor/runner.rb +1 -1
data/lib/thor/shell/basic.rb +16 -16
data/lib/thor/shell/color.rb +9 -9
data/lib/thor/shell/html.rb +9 -9
data/lib/thor/task.rb +2 -2
data/lib/thor/version.rb +1 -1
data/spec/actions/create_file_spec.rb +30 -30
data/spec/actions/create_link_spec.rb +12 -12
data/spec/actions/directory_spec.rb +34 -27
data/spec/actions/empty_directory_spec.rb +16 -16
data/spec/actions/file_manipulation_spec.rb +62 -50
data/spec/actions/inject_into_file_spec.rb +18 -18
data/spec/actions_spec.rb +56 -56
data/spec/base_spec.rb +69 -69
data/spec/core_ext/hash_with_indifferent_access_spec.rb +19 -14
data/spec/core_ext/ordered_hash_spec.rb +29 -29
data/spec/exit_condition_spec.rb +3 -3
data/spec/fixtures/preserve/script.sh +3 -0
data/spec/fixtures/script.thor +5 -0
data/spec/group_spec.rb +55 -55
data/spec/invocation_spec.rb +26 -26
data/spec/parser/argument_spec.rb +12 -12
data/spec/parser/arguments_spec.rb +12 -12
data/spec/parser/option_spec.rb +47 -47
data/spec/parser/options_spec.rb +137 -72
data/spec/rake_compat_spec.rb +11 -11
data/spec/register_spec.rb +70 -8
data/spec/runner_spec.rb +38 -38
data/spec/shell/basic_spec.rb +49 -37
data/spec/shell/color_spec.rb +13 -13
data/spec/shell/html_spec.rb +3 -3
data/spec/shell_spec.rb +7 -7
data/spec/spec_helper.rb +4 -0
data/spec/task_spec.rb +11 -11
data/spec/thor_spec.rb +161 -91
data/spec/util_spec.rb +42 -42
data/thor.gemspec +1 -7
metadata +8 -118
data/lib/thor/core_ext/dir_escape.rb +0 -0

data/spec/util_spec.rb CHANGED Viewed

@@ -9,112 +9,112 @@ end
 describe Thor::Util do
   describe "#find_by_namespace" do
     it "returns 'default' if no namespace is given" do
-      Thor::Util.find_by_namespace('').should == Scripts::MyDefaults
+      expect(Thor::Util.find_by_namespace('')).to eq(Scripts::MyDefaults)
     end
     it "adds 'default' if namespace starts with :" do
-      Thor::Util.find_by_namespace(':child').should == Scripts::ChildDefault
+      expect(Thor::Util.find_by_namespace(':child')).to eq(Scripts::ChildDefault)
     end
     it "returns nil if the namespace can't be found" do
-      Thor::Util.find_by_namespace('thor:core_ext:ordered_hash').should be_nil
+      expect(Thor::Util.find_by_namespace('thor:core_ext:ordered_hash')).to be_nil
     end
     it "returns a class if it matches the namespace" do
-      Thor::Util.find_by_namespace('app:broken:counter').should == BrokenCounter
+      expect(Thor::Util.find_by_namespace('app:broken:counter')).to eq(BrokenCounter)
     end
     it "matches classes default namespace" do
-      Thor::Util.find_by_namespace('scripts:my_script').should == Scripts::MyScript
+      expect(Thor::Util.find_by_namespace('scripts:my_script')).to eq(Scripts::MyScript)
     end
   end
   describe "#namespace_from_thor_class" do
     it "replaces constant nesting with task namespacing" do
-      Thor::Util.namespace_from_thor_class("Foo::Bar::Baz").should == "foo:bar:baz"
+      expect(Thor::Util.namespace_from_thor_class("Foo::Bar::Baz")).to eq("foo:bar:baz")
     end
     it "snake-cases component strings" do
-      Thor::Util.namespace_from_thor_class("FooBar::BarBaz::BazBoom").should == "foo_bar:bar_baz:baz_boom"
+      expect(Thor::Util.namespace_from_thor_class("FooBar::BarBaz::BazBoom")).to eq("foo_bar:bar_baz:baz_boom")
     end
     it "accepts class and module objects" do
-      Thor::Util.namespace_from_thor_class(Thor::CoreExt::OrderedHash).should == "thor:core_ext:ordered_hash"
-      Thor::Util.namespace_from_thor_class(Thor::Util).should == "thor:util"
+      expect(Thor::Util.namespace_from_thor_class(Thor::CoreExt::OrderedHash)).to eq("thor:core_ext:ordered_hash")
+      expect(Thor::Util.namespace_from_thor_class(Thor::Util)).to eq("thor:util")
     end
     it "removes Thor::Sandbox namespace" do
-      Thor::Util.namespace_from_thor_class("Thor::Sandbox::Package").should == "package"
+      expect(Thor::Util.namespace_from_thor_class("Thor::Sandbox::Package")).to eq("package")
     end
   end
   describe "#namespaces_in_content" do
     it "returns an array of names of constants defined in the string" do
       list = Thor::Util.namespaces_in_content("class Foo; class Bar < Thor; end; end; class Baz; class Bat; end; end")
-      list.should include("foo:bar")
-      list.should_not include("bar:bat")
+      expect(list).to include("foo:bar")
+      expect(list).not_to include("bar:bat")
     end
     it "doesn't put the newly-defined constants in the enclosing namespace" do
       Thor::Util.namespaces_in_content("class Blat; end")
-      defined?(Blat).should_not be
-      defined?(Thor::Sandbox::Blat).should be
+      expect(defined?(Blat)).not_to be
+      expect(defined?(Thor::Sandbox::Blat)).to be
     end
   end
   describe "#snake_case" do
     it "preserves no-cap strings" do
-      Thor::Util.snake_case("foo").should == "foo"
-      Thor::Util.snake_case("foo_bar").should == "foo_bar"
+      expect(Thor::Util.snake_case("foo")).to eq("foo")
+      expect(Thor::Util.snake_case("foo_bar")).to eq("foo_bar")
     end
     it "downcases all-caps strings" do
-      Thor::Util.snake_case("FOO").should == "foo"
-      Thor::Util.snake_case("FOO_BAR").should == "foo_bar"
+      expect(Thor::Util.snake_case("FOO")).to eq("foo")
+      expect(Thor::Util.snake_case("FOO_BAR")).to eq("foo_bar")
     end
     it "downcases initial-cap strings" do
-      Thor::Util.snake_case("Foo").should == "foo"
+      expect(Thor::Util.snake_case("Foo")).to eq("foo")
     end
     it "replaces camel-casing with underscores" do
-      Thor::Util.snake_case("FooBarBaz").should == "foo_bar_baz"
-      Thor::Util.snake_case("Foo_BarBaz").should == "foo_bar_baz"
+      expect(Thor::Util.snake_case("FooBarBaz")).to eq("foo_bar_baz")
+      expect(Thor::Util.snake_case("Foo_BarBaz")).to eq("foo_bar_baz")
     end
     it "places underscores between multiple capitals" do
-      Thor::Util.snake_case("ABClass").should == "a_b_class"
+      expect(Thor::Util.snake_case("ABClass")).to eq("a_b_class")
     end
   end
   describe "#find_class_and_task_by_namespace" do
     it "returns a Thor::Group class if full namespace matches" do
-      Thor::Util.find_class_and_task_by_namespace("my_counter").should == [MyCounter, nil]
+      expect(Thor::Util.find_class_and_task_by_namespace("my_counter")).to eq([MyCounter, nil])
     end
     it "returns a Thor class if full namespace matches" do
-      Thor::Util.find_class_and_task_by_namespace("thor").should == [Thor, nil]
+      expect(Thor::Util.find_class_and_task_by_namespace("thor")).to eq([Thor, nil])
     end
     it "returns a Thor class and the task name" do
-      Thor::Util.find_class_and_task_by_namespace("thor:help").should == [Thor, "help"]
+      expect(Thor::Util.find_class_and_task_by_namespace("thor:help")).to eq([Thor, "help"])
     end
     it "falls back in the namespace:task look up even if a full namespace does not match" do
       Thor.const_set(:Help, Module.new)
-      Thor::Util.find_class_and_task_by_namespace("thor:help").should == [Thor, "help"]
+      expect(Thor::Util.find_class_and_task_by_namespace("thor:help")).to eq([Thor, "help"])
       Thor.send :remove_const, :Help
     end
     it "falls back on the default namespace class if nothing else matches" do
-      Thor::Util.find_class_and_task_by_namespace("test").should == [Scripts::MyDefaults, "test"]
+      expect(Thor::Util.find_class_and_task_by_namespace("test")).to eq([Scripts::MyDefaults, "test"])
     end
   end
   describe "#thor_classes_in" do
     it "returns thor classes inside the given class" do
-      Thor::Util.thor_classes_in(MyScript).should == [MyScript::AnotherScript]
-      Thor::Util.thor_classes_in(MyScript::AnotherScript).should be_empty
+      expect(Thor::Util.thor_classes_in(MyScript)).to eq([MyScript::AnotherScript])
+      expect(Thor::Util.thor_classes_in(MyScript::AnotherScript)).to be_empty
     end
   end
@@ -125,14 +125,14 @@ describe Thor::Util do
     end
     it "returns the user path if none variable is set on the environment" do
-      Thor::Util.user_home.should == File.expand_path("~")
+      expect(Thor::Util.user_home).to eq(File.expand_path("~"))
     end
     it "returns the *unix system path if file cannot be expanded and separator does not exist" do
       File.should_receive(:expand_path).with("~").and_raise(RuntimeError)
       previous_value = File::ALT_SEPARATOR
       capture(:stderr){ File.const_set(:ALT_SEPARATOR, false) }
-      Thor::Util.user_home.should == "/"
+      expect(Thor::Util.user_home).to eq("/")
       capture(:stderr){ File.const_set(:ALT_SEPARATOR, previous_value) }
     end
@@ -140,24 +140,24 @@ describe Thor::Util do
       File.should_receive(:expand_path).with("~").and_raise(RuntimeError)
       previous_value = File::ALT_SEPARATOR
       capture(:stderr){ File.const_set(:ALT_SEPARATOR, true) }
-      Thor::Util.user_home.should == "C:/"
+      expect(Thor::Util.user_home).to eq("C:/")
       capture(:stderr){ File.const_set(:ALT_SEPARATOR, previous_value) }
     end
     it "returns HOME/.thor if set" do
       ENV.stub!(:[]).with("HOME").and_return("/home/user/")
-      Thor::Util.user_home.should == "/home/user/"
+      expect(Thor::Util.user_home).to eq("/home/user/")
     end
     it "returns path with HOMEDRIVE and HOMEPATH if set" do
       ENV.stub!(:[]).with("HOMEDRIVE").and_return("D:/")
       ENV.stub!(:[]).with("HOMEPATH").and_return("Documents and Settings/James")
-      Thor::Util.user_home.should == "D:/Documents and Settings/James"
+      expect(Thor::Util.user_home).to eq("D:/Documents and Settings/James")
     end
     it "returns APPDATA/.thor if set" do
       ENV.stub!(:[]).with("APPDATA").and_return("/home/user/")
-      Thor::Util.user_home.should == "/home/user/"
+      expect(Thor::Util.user_home).to eq("/home/user/")
     end
   end
@@ -170,27 +170,27 @@ describe Thor::Util do
     it "escapes globs in path" do
       ENV.stub!(:[]).with("HOME").and_return("/home/user{1}/")
       Dir.should_receive(:[]).with("/home/user\\{1\\}/.thor/*").and_return([])
-      Thor::Util.thor_root_glob.should == []
+      expect(Thor::Util.thor_root_glob).to eq([])
     end
   end
   describe "#globs_for" do
     it "escapes globs in path" do
-      Thor::Util.globs_for("/home/apps{1}").should == [
+      expect(Thor::Util.globs_for("/home/apps{1}")).to eq([
         "/home/apps\\{1\\}/Thorfile",
         "/home/apps\\{1\\}/*.thor",
         "/home/apps\\{1\\}/tasks/*.thor",
         "/home/apps\\{1\\}/lib/tasks/*.thor"
-      ]
+      ])
     end
   end
   describe "#escape_globs" do
     it "escapes ? * { } [ ] glob characters" do
-      Thor::Util.escape_globs("apps?").should == "apps\\?"
-      Thor::Util.escape_globs("apps*").should == "apps\\*"
-      Thor::Util.escape_globs("apps {1}").should == "apps \\{1\\}"
-      Thor::Util.escape_globs("apps [1]").should == "apps \\[1\\]"
+      expect(Thor::Util.escape_globs("apps?")).to eq("apps\\?")
+      expect(Thor::Util.escape_globs("apps*")).to eq("apps\\*")
+      expect(Thor::Util.escape_globs("apps {1}")).to eq("apps \\{1\\}")
+      expect(Thor::Util.escape_globs("apps [1]")).to eq("apps \\[1\\]")
     end
   end
 end

data/thor.gemspec CHANGED Viewed

@@ -2,13 +2,6 @@
 require File.expand_path('../lib/thor/version', __FILE__)
 Gem::Specification.new do |s|
-  s.add_development_dependency 'bundler', '~> 1.0'
-  s.add_development_dependency 'fakeweb', '~> 1.3'
-  s.add_development_dependency 'rake', '~> 0.9'
-  s.add_development_dependency 'rdoc', '~> 3.9'
-  s.add_development_dependency 'rspec', '~> 2.3'
-  s.add_development_dependency 'simplecov', '~> 0.4'
-  s.add_development_dependency 'childlabor'
   s.authors = ['Yehuda Katz', 'José Valim']
   s.description = %q{A scripting framework that replaces rake, sake and rubigen}
   s.email = '[email protected]'
@@ -16,6 +9,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['CHANGELOG.rdoc', 'LICENSE.md', 'README.md', 'Thorfile']
   s.files = `git ls-files`.split("\n")
   s.homepage = 'http://whatisthor.com/'
+  s.licenses = ['MIT']
   s.name = 'thor'
   s.rdoc_options = ['--charset=UTF-8']
   s.require_paths = ['lib']

metadata CHANGED Viewed

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: thor
 version: !ruby/object:Gem::Version
-  version: 0.16.0
   prerelease:
+  version: 0.17.0
 platform: ruby
 authors:
 - Yehuda Katz
@@ -10,120 +10,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: childlabor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-01-24 00:00:00.000000000 Z
+dependencies: []
 description: A scripting framework that replaces rake, sake and rubigen
 email: [email protected]
 executables:
@@ -156,7 +44,6 @@ files:
 - lib/thor/actions/file_manipulation.rb
 - lib/thor/actions/inject_into_file.rb
 - lib/thor/base.rb
-- lib/thor/core_ext/dir_escape.rb
 - lib/thor/core_ext/file_binary_read.rb
 - lib/thor/core_ext/hash_with_indifferent_access.rb
 - lib/thor/core_ext/ordered_hash.rb
@@ -203,6 +90,7 @@ files:
 - spec/fixtures/group.thor
 - spec/fixtures/invoke.thor
 - spec/fixtures/path with spaces
+- spec/fixtures/preserve/script.sh
 - spec/fixtures/script.thor
 - spec/fixtures/task.thor
 - spec/group_spec.rb
@@ -224,7 +112,8 @@ files:
 - spec/util_spec.rb
 - thor.gemspec
 homepage: http://whatisthor.com/
-licenses: []
+licenses:
+- MIT
 post_install_message:
 rdoc_options:
 - --charset=UTF-8
@@ -244,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: A scripting framework that replaces rake, sake and rubigen
@@ -275,6 +164,7 @@ test_files:
 - spec/fixtures/group.thor
 - spec/fixtures/invoke.thor
 - spec/fixtures/path with spaces
+- spec/fixtures/preserve/script.sh
 - spec/fixtures/script.thor
 - spec/fixtures/task.thor
 - spec/group_spec.rb

data/lib/thor/core_ext/dir_escape.rb DELETED Viewed

File without changes