pry-theme 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ec3ba87078dcd871ff8f2e8ca16043f2f9303b
-  data.tar.gz: 3f3a8984f4e7505ef9a8b259b67a3558b1a25ad4
+  metadata.gz: 657593d26a0afa7197bdeda4e33dac70dd3d13b5
+  data.tar.gz: eb3bf3c8dbc7c5a7f16b97027f7ea856d1efb33a
 SHA512:
-  metadata.gz: 12651266f54f2d5e9f25410152d90ad2df7ae65b1eedd7be71dfbcd323607fe989e019b86c7c90e4595a1f96c43450b3b7754ef3dcfa28e4c7695a3db921c964
-  data.tar.gz: c82fb3357830836e1836e5331ec2c127d85a96fbd7c016888ba4239ec4c3f1ecce8fead4e39257d3d969b72cdc25b1bbcb106d500d884aba34722af0820af23e
+  metadata.gz: 5f3b617dab0c190ab3bbad3c8d00914f528b9235fecd8ad8895f9085d7243f71d79dfdcaef26ac5690d531ca2da841d45cc06e637456208f4d6c58edb074819b
+  data.tar.gz: 08fa73ba0512df853a2892c5f264cb830c77a3575f0a7d6719767ee169efe58511a55e9d530ef0b93f7aac9af799cbf94b48b0f4085fed83235e7dec3b3caa96

data/.travis.yml

@@ -1,19 +1,16 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1
   - ruby-head
-  - ree
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
-  - jruby-19mode
+  - rbx-2
+  - jruby
   - jruby-head
 
+script:
+  - rake spec
+
 branches:
   only:
     - master
-
-before_install:
-  - gem install sinatra
-  - gem install random-word

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Pry Theme changelog
 ===================
 
+### v1.0.3 (May 12, 2014)
+
+* Fixed error when Pry.config.theme is set to a theme that doesn't exist
+  [→](https://github.com/kyrylo/pry-theme/issues/39)
+* Corrected README.md errors and confusing parts
+
 ### v1.0.2 (January 28, 2014)
 
 * Set stricter dependencies (namely, Pry Theme started demanding CodeRay v1.1.0

data/README.md

@@ -35,11 +35,18 @@ following line to your `.pryrc`:
 
     Pry.config.theme = "theme-name"
 
-The default theme is `pry-classic` (basically, you shouldn't notice it, because
-it resembles the default outlook of Pry, as though you didn't install anything).
+The default theme is the one from the `pry-classic` family. It is dependent on
+your terminal capabilities. For example, if you're using Windows, your default
+theme will be `pry-classic-16`, since the Windows terminal can't support more
+than 16 colours. If you're using xterm or urxvt, then your default theme will be
+`pry-classic-256` (basically, you shouldn't notice it, because it resembles the
+default outlook of Pry, as though Pry Theme isn't present). This outlines the
+rule: the more colours your terminal supports, the more vivid version of
+`pry-classic` is used.
+
 Let's change it to something more neoteric:
 
-    Pry.config.theme = "pry-modern"
+    Pry.config.theme = "pry-modern-256"
 
 That's all! Launch your Pry and you will see the changes.
 
@@ -49,9 +56,9 @@ Pry Theme has a command-line interface available via Pry. Just launch Pry and
 start working with it. For example, you can _temporary_ change themes on the
 fly (only for the current session):
 
-    [1] pry(main)> pry-theme try pry-classic
+    [1] pry(main)> pry-theme try pry-classic-8
 
-This subcommand would switch your current theme to `pry-classic` theme.
+This subcommand would switch your current theme to `pry-classic-8` theme.
 
 You can find [more information about CLI in Pry Theme Wiki][cli].
 
@@ -67,7 +74,7 @@ If you already have your theme stored somewhere on disk, just put it in the
 
 If you don't want to bother with routine operations, you can install a theme
 from the Collection with help of `pry-theme install <name>` subcommand. For
-example, you can want to install xoria256 theme. Just execute
+example, you can want to install the xoria256 theme. Just execute
 `pry-theme install xoria256` and you're done.
 
 Oh, and don't forget to adjust your `.pryrc`!

data/Rakefile

@@ -8,8 +8,8 @@ def test_files
 end
 
 desc "Run tests"
-task :test do
+task :spec do
   exec "bacon -Ispec #{ quiet } #{ test_files }"
 end
 
-task :default => :test
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/pry-theme/when_started_hook.rb

@@ -4,9 +4,10 @@ module PryTheme
       recreate_user_themes_from_default_ones
       load_themes
 
-      if Pry.config.theme
+      if File.exist?(theme_file)
         ThemeList.activate_theme(Pry.config.theme)
       else
+        display_warning(_pry_) if Pry.config.theme
         ThemeList.activate_theme_intelligently
       end
     end
@@ -15,12 +16,12 @@ module PryTheme
 
     # Copy a default theme to theme directory, but only if it isn't there yet.
     def recreate_user_themes_from_default_ones
-      FileUtils.mkdir_p(USER_THEMES_DIR) unless File.exists?(USER_THEMES_DIR)
+      FileUtils.mkdir_p(USER_THEMES_DIR) unless File.exist?(USER_THEMES_DIR)
       default_themes = Dir.entries(DEF_THEMES_DIR) - %w{. ..}
 
       default_themes.each do |theme|
         user_theme_path = File.join(USER_THEMES_DIR, theme)
-        unless File.exists?(user_theme_path)
+        unless File.exist?(user_theme_path)
           def_theme_path = File.join(DEF_THEMES_DIR, theme)
           FileUtils.cp(def_theme_path, USER_THEMES_DIR)
         end
@@ -34,5 +35,15 @@ module PryTheme
       end
     end
 
+    def theme_file
+      File.join(USER_THEMES_DIR, Pry.config.theme.to_s + PT_EXT)
+    end
+
+    def display_warning(pry)
+      pry.output.puts 'Pry Theme Warning: Pry.config.theme is set to ' +
+        "\"#{ Pry.config.theme }\". There's no such a theme in your system. " +
+        "All installed themes live inside #{ USER_THEMES_DIR }. Falling back " +
+        'to the default theme for now.'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-theme
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kyrylo Silin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An easy way to customize Pry colors via theme files