morale 1.0.0 → 1.1.0

data/Gemfile

@@ -1,9 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'rake', '0.8.7'
-gem 'httparty', '0.7.8'
+gem 'morale-client'
 gem 'json', '1.4.6'
-gem 'crack', '0.1.8'
 gem 'thor', '0.14.6'
 gem 'hirb'
 

data/Gemfile.lock

@@ -24,6 +24,9 @@ GEM
     httparty (0.7.8)
       crack (= 0.1.8)
     json (1.4.6)
+    morale-client (0.0.1)
+      httparty (~> 0.7.8)
+      json (~> 1.4.6)
     rake (0.8.7)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -44,12 +47,11 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (= 0.3.6)
-  crack (= 0.1.8)
   cucumber (= 1.0.6)
   diff-lcs (= 1.1.3)
   hirb
-  httparty (= 0.7.8)
   json (= 1.4.6)
+  morale-client
   rake (= 0.8.7)
   rspec (= 2.6.0)
   thor (= 0.14.6)

data/lib/morale/account.rb

@@ -3,7 +3,7 @@ require 'morale/credentials_store'
 
 module Morale
   class Account
-    include Morale::Platform
+    include Morale::IO
     
     class << self
       include Morale::CredentialsStore
@@ -82,7 +82,7 @@ module Morale
         password = running_on_windows? ? ask_for_secret_on_windows : ask_for_secret
         api_key = Morale::Client.authorize(user, password, @subdomain).api_key
 
-        say "Invalid email/password combination or API key was not generated." if api_key.nil?
+        say "Invalid email/password combination or API key was not generated." if api_key.empty?
 
         [@subdomain, api_key]
       end

data/lib/morale/command.rb

@@ -7,7 +7,6 @@ require 'morale/commands/ticket'
 
 module Morale
   class Command < Thor
-    include Morale::Platform
     
     desc "login", "Signs a user in using their email address and password. Stores the users API key locally to use for access later."
     def login

data/lib/morale/commands/account.rb

@@ -6,7 +6,7 @@ require 'morale/authorization'
 module Morale::Commands
   class Account
     class << self
-      include Morale::Platform
+      include Morale::IO
       
       def list(email="", change=false)
         accounts = Morale::Client.accounts(email) unless email.nil? || email.empty?

data/lib/morale/commands/project.rb

@@ -5,7 +5,7 @@ require 'morale/authorization'
 module Morale::Commands
   class Project
     class << self
-      include Morale::Platform
+      include Morale::IO
       
       def list(change=false)
         begin

data/lib/morale/commands/ticket.rb

@@ -7,7 +7,7 @@ require 'hirb'
 module Morale::Commands
   class Ticket
     class << self
-      include Morale::Platform
+      include Morale::IO
       include Morale::Flow
       
       def command(command)

data/lib/morale/credentials_store.rb

@@ -1,10 +1,12 @@
 require 'morale/storage'
 require 'morale/platform'
+require 'morale/io'
 
 module Morale
   module CredentialsStore
     include Morale::Storage
     include Morale::Platform
+    include Morale::IO
     
     attr_accessor :credentials
     

data/lib/morale/{platform.rb → io.rb}

@@ -1,13 +1,5 @@
 module Morale
-  module Platform
-    def home_directory
-      running_on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
-    end
-    
-    def running_on_windows?
-      RUBY_PLATFORM =~ /mswin32|mingw32/
-    end
-    
+  module IO
     def say(message="", color=nil, force_new_line=(message.to_s !~ /( |\t)$/))
       message = message.to_s
       message = set_color(message, color) if color

data/lib/morale.rb

@@ -1,5 +1,5 @@
 module Morale
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end
 
 require 'morale/command'

data/morale.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'morale'
-  s.version           = '1.0.0'
-  s.date              = '2011-10-26'
+  s.version           = '1.1.0'
+  s.date              = '2011-12-12'
   s.rubyforge_project = 'morale'
 
   s.summary     = "Command line interface to create & manage tickets on Morale."
@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   s.executables = ["morale"]
 
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.md LICENSE]
+  s.extra_rdoc_files = %w[README.md]
 
+  s.add_dependency('morale-client', "~> 0.0.1")
   s.add_dependency('hirb', "~> 0.5.0")
-  s.add_dependency('httparty', "~> 0.7.8")
   s.add_dependency('json', "~> 1.4.6")
   s.add_dependency('thor', "~> 0.14.6")
 
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
   s.files = %w[
     Gemfile
     Gemfile.lock
-    LICENSE
     README.md
     Rakefile
     bin/morale
@@ -50,22 +49,17 @@ Gem::Specification.new do |s|
     lib/morale.rb
     lib/morale/account.rb
     lib/morale/authorization.rb
-    lib/morale/client.rb
     lib/morale/command.rb
     lib/morale/commands/account.rb
     lib/morale/commands/authorization.rb
     lib/morale/commands/project.rb
     lib/morale/commands/ticket.rb
-    lib/morale/connection_store.rb
     lib/morale/credentials_store.rb
     lib/morale/flow.rb
-    lib/morale/platform.rb
-    lib/morale/storage.rb
+    lib/morale/io.rb
     morale.gemspec
     spec/morale/account_spec.rb
-    spec/morale/client_spec.rb
     spec/morale/command_spec.rb
-    spec/morale/connection_store_spec.rb
     spec/morale/credentials_store_spec.rb
     spec/morale/storage_spec.rb
     spec/spec_helper.rb

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Brilliant Fantastic
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 -04:00
+date: 2011-12-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hirb
+  name: morale-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,13 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
         - 0
-        version: 0.5.0
+        - 1
+        version: 0.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: hirb
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        - 8
-        version: 0.7.8
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -81,11 +81,9 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
-- LICENSE
 files: 
 - Gemfile
 - Gemfile.lock
-- LICENSE
 - README.md
 - Rakefile
 - bin/morale
@@ -99,22 +97,17 @@ files:
 - lib/morale.rb
 - lib/morale/account.rb
 - lib/morale/authorization.rb
-- lib/morale/client.rb
 - lib/morale/command.rb
 - lib/morale/commands/account.rb
 - lib/morale/commands/authorization.rb
 - lib/morale/commands/project.rb
 - lib/morale/commands/ticket.rb
-- lib/morale/connection_store.rb
 - lib/morale/credentials_store.rb
 - lib/morale/flow.rb
-- lib/morale/platform.rb
-- lib/morale/storage.rb
+- lib/morale/io.rb
 - morale.gemspec
 - spec/morale/account_spec.rb
-- spec/morale/client_spec.rb
 - spec/morale/command_spec.rb
-- spec/morale/connection_store_spec.rb
 - spec/morale/credentials_store_spec.rb
 - spec/morale/storage_spec.rb
 - spec/spec_helper.rb

data/lib/morale/client.rb

@@ -1,84 +0,0 @@
-require 'httparty'
-require 'json'
-require 'morale/account'
-require 'morale/connection_store'
-
-module Morale
-  class Client
-    class Unauthorized  < RuntimeError; end
-    class NotFound < RuntimeError; end
-    
-    include HTTParty
-    extend Morale::ConnectionStore
-    
-    format :json
-    
-    API_VERSION = 'v1'
-    
-    attr_accessor :api_key
-    attr_reader   :subdomain
-    
-    def self.authorize(user, password, subdomain)
-      client = new(subdomain)
-      client.unauthorize
-      client.api_key = client.class.post('/in', :body => { :email => user, :password => password })["api_key"]
-      return client
-    end
-    
-    def self.accounts(user)
-      client = new
-      client.unauthorize
-      response = client.class.get("/accounts", :query => { :email => user })
-      raise Unauthorized if response.code == 401
-      raise NotFound if response.code == 404
-      response
-    end
-    
-    def accounts
-      authorize
-      response = self.class.get("/accounts", :query => { :api_key => @api_key })
-      raise Unauthorized if response.code == 401
-      raise NotFound if response.code == 404
-      response
-    end
-    
-    def initialize(subdomain="", api_key="")
-      @api_key = api_key
-      @subdomain = subdomain
-      self.class.default_options[:base_uri] = HTTParty.normalize_base_uri("#{subdomain}#{"." unless subdomain.nil? || subdomain.empty?}#{self.class.base_url}/api/#{API_VERSION}")
-    end
-    
-    def projects
-      authorize
-      response = self.class.get('/projects')
-      raise Unauthorized if response.code == 401
-      raise NotFound if response.code == 404
-      response
-    end
-    
-    def tickets(options={})
-      authorize
-      response = self.class.get("/projects/#{options[:project_id]}/tickets")
-      raise Unauthorized if response.code == 401
-      raise NotFound if response.code == 404
-      response
-    end
-    
-    def ticket(project_id, command)
-      authorize
-      response = self.class.post("/projects/#{project_id}/tickets", :body => { :command => command })
-      raise Unauthorized if response.code == 401
-      raise NotFound if response.code == 404
-      response
-    end
-    
-    def authorize
-      self.class.basic_auth @subdomain, @api_key
-    end
-    
-    def unauthorize
-      self.class.basic_auth nil, nil
-    end
-    
-  end
-end

data/lib/morale/connection_store.rb

@@ -1,58 +0,0 @@
-require 'morale/storage'
-require 'morale/platform'
-
-module Morale
-  module ConnectionStore
-    include Morale::Storage
-    include Morale::Platform
-    
-    def base_url
-      if @base_url.nil?
-        @base_url = read_connection
-        if @base_url.nil?
-          @base_url = default_base_url
-          self.write_connection
-        end
-      end
-      @base_url
-    end
-    
-    def base_url=(value)
-      @base_url = value
-      self.write_connection
-    end
-    
-    def location
-      ENV['CONNECTION_LOCATION'] || default_location
-    end
-    
-    def location=(value)
-      ENV['CONNECTION_LOCATION'] = value
-    end
-    
-    def default_location
-      "#{home_directory}/.morale/connection"
-    end
-    
-    def delete_connection
-      self.delete
-      @base_url = nil
-    end
-    
-    def read_connection
-      connection = self.read
-      connection.split("\n") if connection
-    end
-    
-    def write_connection
-      self.write self.base_url
-    end
-    
-    private
-    
-    def default_base_url
-      ENV['DEFAULT_BASE_URL'] || "teammorale.com"
-    end
-    
-  end
-end

data/lib/morale/storage.rb

@@ -1,29 +0,0 @@
-module Morale
-  module Storage
-    
-    attr_accessor :location
-    
-    def delete
-      FileUtils.rm_f(location)
-    end
-    
-    def read
-      File.exists?(location) and File.read(location)
-    end
-    
-    def write(data)
-      FileUtils.mkdir_p(File.dirname(location))
-      f = File.open(location, 'w')
-      f.puts data
-      f.close
-      set_permissions
-    end
-    
-    private
-    
-    def set_permissions
-      FileUtils.chmod 0700, File.dirname(location)
-      FileUtils.chmod 0600, location
-    end
-  end
-end

data/spec/morale/client_spec.rb

@@ -1,119 +0,0 @@
-require "spec_helper"
-require "json"
-require "morale/client"
-
-describe Morale::Client do
-  describe "#authorize" do
-    it "authorizes a user with a valid email address and password" do
-      api_key = "blah"
-      stub_request(:post, "http://blah.lvh.me:3000/api/v1/in").to_return(:body => { "api_key" => "#{api_key}" }.to_json)
-      Morale::Client.authorize(nil, nil, 'blah').api_key.should == api_key
-    end
-  end
-  
-  describe "#accounts" do
-    it "displays all the accounts for a specific user based on their email" do
-      stub_request(:get, "http://lvh.me:3000/api/v1/accounts?email=someone@example.com").to_return(:body => 
-        [{"account" => {"group_name" => "Shimmy Sham","site_address"=>"shimmy_sham","created_at" => "2011-07-31T21:28:53Z","updated_at" => "2011-07-31T21:28:53Z","plan_id" => 1,"id" => 2}},
-         {"account" => {"group_name" => "Pumpkin Tarts","site_address"=>"pumpkin_tarts","created_at" => "2011-07-31T21:40:24Z","updated_at" => "2011-07-31T21:40:24Z","plan_id" => 1,"id" => 1}}].to_json)
-         
-      accounts = Morale::Client.accounts('someone@example.com')
-      accounts.count.should == 2
-    end
-    
-    it "displays all the accounts for a specific user based on their api_key" do
-      stub_request(:get, "http://blah:@blah.lvh.me:3000/api/v1/accounts?api_key=").to_return(:body => 
-        [{"account" => {"group_name" => "Shimmy Sham","site_address"=>"shimmy_sham","created_at" => "2011-07-31T21:28:53Z","updated_at" => "2011-07-31T21:28:53Z","plan_id" => 1,"id" => 2}},
-         {"account" => {"group_name" => "Pumpkin Tarts","site_address"=>"pumpkin_tarts","created_at" => "2011-07-31T21:40:24Z","updated_at" => "2011-07-31T21:40:24Z","plan_id" => 1,"id" => 1}}].to_json)
-      
-      client = Morale::Client.new('blah')   
-      client.accounts.count.should == 2
-      client.accounts[0]["account"]["group_name"].should == "Shimmy Sham"
-    end
-  end
-  
-  describe "#projects" do
-    it "displays all the projects for a specific account" do
-      stub_request(:get, "http://blah:@blah.lvh.me:3000/api/v1/projects").to_return(:body => 
-        [{"project" => {"name" => "Skunk Works","created_at" => "2011-07-31T21:40:24Z","updated_at" => "2011-07-31T21:40:24Z","account_id" => 1,"id" => 1}},
-         {"project" => {"name" => "Poop Shoot","created_at" => "2011-07-31T21:28:53Z","updated_at" => "2011-07-31T21:28:53Z","account_id" => 1,"id" => 2}}].to_json)
-      client = Morale::Client.new('blah')
-      client.projects.count.should == 2
-      client.projects[0]["project"]["name"].should == "Skunk Works"
-      client.projects[1]["project"]["id"].should == 2
-    end
-    
-    it "should raise unauthorized if a 401 is received" do
-      stub_request(:get, "http://blah:@blah.lvh.me:3000/api/v1/projects").to_return(:status => 401)
-      client = Morale::Client.new('blah')
-      lambda { client.projects.count }.should raise_error(Morale::Client::Unauthorized)
-    end
-  end
-  
-  describe "#ticket" do
-    it "should return a JSON ticket that was created" do
-      stub_request(:post, "http://blah:123456@blah.lvh.me:3000/api/v1/projects/1/tickets").
-        with(:body => "command=This%20is%20a%20test%20that%20should%20create%20a%20new%20task%20as%3A%20Lester").
-        to_return(:body => { 
-          "created_at" => "2011-09-27T02:56:03Z",
-          "assigned_to" => { "user" => { "first_name" => "Lester", "last_name" => "Tester", "email" => "test@test.com" } },
-          "title" => "This is a test that should create a new task",
-          "project_id" => "1",
-          "priority" => "null",
-          "archived" => "false",
-          "id" => "1",
-          "created_by" => { "user" => { "first_name" => "Lester", "last_name" => "Tester", "email" => "test@test.com" } },
-          "due_date" => "null",
-          "identifier" => "1" }.to_json
-      )
-      client = Morale::Client.new('blah', '123456')
-      response = client.ticket(1, "This is a test that should create a new task as: Lester")
-      response['title'].should == "This is a test that should create a new task"
-      response['assigned_to']['user']['first_name'].should == "Lester"
-      response['project_id'].should == "1"
-    end
-    
-    it "should raise unauthorized if a 401 is received" do
-      stub_request(:post, "http://blah:123456@blah.lvh.me:3000/api/v1/projects/1/tickets").
-        with(:body => "command=This%20is%20a%20test%20that%20should%20create%20a%20new%20task%20as%3A%20Lester").
-        to_return(:status => 401)
-      client = Morale::Client.new('blah', '123456')
-      lambda { client.ticket('1', "This is a test that should create a new task as: Lester") }.should raise_error(Morale::Client::Unauthorized)
-    end
-    
-    it "should raise notfound if a 404 is received" do
-      stub_request(:post, "http://blah:123456@blah.lvh.me:3000/api/v1/projects/1/tickets").
-        with(:body => "command=This%20is%20a%20test%20that%20should%20create%20a%20new%20task%20as%3A%20Lester").
-        to_return(:status => 404)
-      client = Morale::Client.new('blah', '123456')
-      lambda { client.ticket('1', "This is a test that should create a new task as: Lester") }.should raise_error(Morale::Client::NotFound)
-    end
-  end
-  
-  describe "#tickets" do
-    it "should return all active tickets when no options are specified" do
-      stub_request(:get, "http://blah:123456@blah.lvh.me:3000/api/v1/projects/1/tickets").to_return(:body => 
-        [{"ticket" => {"title" => "This is test #1","created_at" => "2011-07-31T21:40:24Z","updated_at" => "2011-07-31T21:40:24Z","project_id" => 1,"id" => 1,"identifier" => "1","type" => "Task","due_date" => "2011-10-15 16:00:00.000000","priority" => nil,"archived" => "f"}},
-         {"ticket" => {"title" => "This is test #2","created_at" => "2011-07-31T21:28:53Z","updated_at" => "2011-07-31T21:28:53Z","project_id" => 1,"id" => 2, "identifier" => "2","type" => "Bug","due_date" => nil,"priority" => "2","archived" => "f"}}].to_json)
-      client = Morale::Client.new('blah', '123456')
-      response = client.tickets({:project_id => 1})
-      response.count.should == 2
-      response[0]["ticket"]["title"].should == "This is test #1"
-      response[1]["ticket"]["title"].should == "This is test #2"
-    end
-    
-    it "should raise unauthorized if a 401 is received" do
-      stub_request(:get, "http://blah:123456@blah.lvh.me:3000/api/v1/projects/1/tickets").
-        to_return(:status => 401)
-      client = Morale::Client.new('blah', '123456')
-      lambda { client.tickets({:project_id => 1}) }.should raise_error(Morale::Client::Unauthorized)
-    end
-    
-    it "should raise notfound if a 404 is received" do
-      stub_request(:get, "http://blah:123456@blah.lvh.me:3000/api/v1/projects/1/tickets").
-        to_return(:status => 404)
-      client = Morale::Client.new('blah', '123456')
-      lambda { client.tickets({ :project_id => 1 }) }.should raise_error(Morale::Client::NotFound)
-    end
-  end
-end

data/spec/morale/connection_store_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-require 'morale/connection_store'
-
-describe Morale::ConnectionStore do
-  
-  class Dummy; end
-  before (:each) do
-    @dummy = Dummy.new
-    @dummy.extend(Morale::ConnectionStore)
-  end
-  
-  after (:each) do
-    @dummy.delete_connection
-  end
-  
-  describe "#location" do
-    it "should return the correct location of the connection file" do
-      @dummy.location.should == "#{ENV['HOME']}/.morale/connection"
-    end
-  end
-  
-  describe "#base_url" do
-    it "should store the default base url if it is not set" do
-      @dummy.base_url.should == "teammorale.com"
-      File.read(@dummy.location).should =~ /teammorale.com/
-    end
-    
-    it "should return the environment variable for the default base url" do
-      @dummy.delete_connection
-      ENV['DEFAULT_BASE_URL'] = "somewhere-else.com"
-      @dummy.base_url.should == "somewhere-else.com"
-    end
-    
-    it "should store the base url when it is set" do
-      @dummy.base_url = "somewhere-else.com"
-      File.read(@dummy.location).should =~ /somewhere-else.com/
-    end
-  end
-  
-  describe "#delete_connection" do
-    it "should clear the base_url field" do
-      ENV['DEFAULT_BASE_URL'] = nil
-      @dummy.base_url = "Blah!"
-      @dummy.delete_connection
-      @dummy.base_url.should == "teammorale.com"
-    end
-    
-    it "should delete the connection file" do
-      FileUtils.mkdir_p(File.dirname(@dummy.location))
-      f = File.open(@dummy.location, 'w')
-      f.puts "Blah!"
-      
-      @dummy.delete_connection
-      File.exists?(@dummy.location).should be_false
-    end
-  end
-  
-  describe "#write_connection" do
-    it "should write data to the location of the connection file" do
-      @dummy.base_url = "Blah!"
-      @dummy.write_connection
-      File.read(@dummy.location).should =~ /Blah!/
-    end
-  end
-end