greenhouse 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275b120e3a88469a7c59a1ef80c34e8e53684599
-  data.tar.gz: 3e5d0d6545c76c9d127252c20616277ccd338c9d
+  metadata.gz: a134de22c868aab5eb02a87a98f2d673a8d73487
+  data.tar.gz: e51793dd35718de74464e70b9e17715bfda2ded0
 SHA512:
-  metadata.gz: b821db4b17049bc511b15af85f48a7810d22b45b8578aeddb47baf89b30ea54f99f88e4de727875639a322f40640477399cb6e58d107bb22fbf1c852070aca60
-  data.tar.gz: 15da3ce7567ce8ac67789d9f839dd202649bbef426c6d3a29571ebadf4286d4e60d27c02bc7d227e81b7a94d7efd8b490c9621e30cee25dec56ab8881395e05f
+  metadata.gz: 5cb9fab942476db9870564a19cd4b0b9908ec70308835f5c21efcf41b5bacaa2a2424b6f6abaa5e50968bc00aa1d00b8e22cc162a51786e8a01e76c2ae80fa95
+  data.tar.gz: 9b5ab3cb8db6b7b55be8c00b181046d2952e514ee404d27a54174a20c6257433794f5f8e76718f8479069bbea629a7dba9b4159e36cd59608f76fbfce4a0096c

data/lib/greenhouse/cli.rb

@@ -56,9 +56,18 @@ module Greenhouse
       binary
     end
 
+    def self.version=(ver)
+      @version = ver
+    end
+
+    def self.version
+      @version ||= VERSION
+    end
+
     def self.usage
       puts <<USAGE
-usage: #{command_name} #{valid_arguments.to_s} <command> [<args>]
+#{binary} v#{version} 
+usage: #{binary} #{valid_arguments.to_s} <command> [<args>]
         
 The available greenhouse commands are:
 USAGE
@@ -69,7 +78,7 @@ USAGE
       end
 
       puts
-      puts "See `#{command_name} help <command>` for more information on a specific command."
+      puts "See `#{binary} help <command>` for more information on a specific command."
     end
     
     def self.start

data/lib/greenhouse/commands/new.rb

@@ -8,7 +8,7 @@ module Greenhouse
 
       class << self
         def usage
-          puts "usage: #{::Greenhouse::CLI.command_name} #{command_name} <name> #{valid_arguments.to_s}"
+          puts "usage: #{::Greenhouse::CLI::binary} #{command_name} <name> #{valid_arguments.to_s}"
         end
       end
 
@@ -21,7 +21,7 @@ module Greenhouse
         projects_directory = arguments.first.key
         if File.exists?(projects_directory)
           STDERR.puts "Directory already exists: #{projects_directory}"
-          STDERR.puts "You can try running `#{::Greenhouse::CLI.command_name} init` from inside the directory."
+          STDERR.puts "You can try running `#{::Greenhouse::CLI::binary} init` from inside the directory."
           exit 1
         end
 
@@ -32,10 +32,7 @@ module Greenhouse
           exit 1
         end
         
-        exec "cd #{projects_directory}; greenhouse init"
-        #Dir.chdir(projects_directory) do
-        #  Init.run
-        #end
+        exec "cd #{projects_directory}; #{::Greenhouse::CLI::binary} init"
       end
     end
   end

data/lib/greenhouse/resources/ignore_file.rb

@@ -36,7 +36,7 @@ module Greenhouse
           # TODO delete any comments immediately preceding the filename
           deleted = super(select { |f| f.file == filename}.first)
           @ignore_file.ignored.each do |ignored|
-            next if ignored.line < deleted.line
+            next if ignored.line <= deleted.line
             ignored.line -= 1
           end
           line = @ignore_file.lines.slice!(deleted.line,1)

data/lib/greenhouse/resources/procfile.rb

@@ -25,7 +25,7 @@ module Greenhouse
         def delete(key)
           del = super(key)
           @procfile.processes.each do |key,process|
-            next if process.line < del.line
+            next if process.line <= del.line
             process.line -= 1
           end
           line = @procfile.lines.slice!(del.line,1)

data/lib/greenhouse/version.rb

@@ -1,8 +1,13 @@
 module Greenhouse
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 
 __END__
+0.0.4:
+* Fixed bug with new not referencing the active binary
+* Fixed a couple off by one errors in resource files
+* Printing version in binary usage output
+
 0.0.3:
 * Ability to set the CLI binary name
 * Broke out Forth Rail specific stuff into it's own binary `forthrail`

data/lib/greenhouse.rb

@@ -1,6 +1,7 @@
 require 'bundler'
 require 'rake'
 require 'active_support/inflector'
+require 'greenhouse/version'
 require 'greenhouse/resources'
 require 'greenhouse/projects'
 require 'greenhouse/scripts'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenhouse
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mark Rebec