duke 0.1.4 → 0.1.5

data/README.rdoc

@@ -32,7 +32,9 @@ Duke will clone the repo and configure it with some defaults.
 === Default Configuration
 
   host: localhost
-Used to generate links to cijoes in the web interface.
+Used to generate links to cijoes and the main duke url.
+  port: nil
+Used to generate the main duke url.
   runner: rake
 When duke checks out a new repo it will configure it to build using this command.
   pid_dir: tmp/pids

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/duke.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{duke}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Marney"]

data/lib/duke.rb

@@ -28,4 +28,7 @@ module Duke
   config_yml = File.exist?(config_path) ? YAML.load_file(config_path) : {}
   config = CONFIG_DEFAULT.merge(config_yml)
   Config = OpenStruct.new(config)
+  url = "http://#{Config.host}"
+  url += ":#{Config.port}" if Config.port
+  Config.host_url = url
 end

data/lib/duke/app.rb

@@ -23,15 +23,15 @@ module Duke
       @project = Project.find(:repo_dir => params[:id])
       if @project.running?
         @project.stop
-      else
+      elsif params[:project][:port]
         @project.start(params[:project][:port])
       end
-      redirect '/'
+      redirect Config.host_url
     end
 
     post '/projects' do
       Project.create(params[:project])
-      redirect '/'
+      redirect Config.host_url
     end
   end
 end

data/lib/duke/controller.rb

@@ -1,7 +1,7 @@
 module Duke
   class Controller
     extend Forwardable
-    def_delegators :controller, :start, :stop, :running?, :pid
+    def_delegators :controller, :start, :stop, :pid
     attr_reader :dir, :repo_dir, :timeout, :port
 
     def self.pid_files
@@ -27,6 +27,10 @@ module Duke
       nil
     end
 
+    def running?
+      port.nil? ? false : controller.running?
+    end
+
     def identifier
       "#{repo_dir}.#{port}"
     end

data/spec/duke/controller_spec.rb

@@ -89,6 +89,24 @@ describe Controller do
     end
   end
 
+  describe "#running" do
+    context "when port is nil" do
+      it "is false" do
+        @controller.stub(:port).and_return(nil)
+        @controller.running?.should be_false
+      end
+    end
+
+    context "when port is not nil" do
+      it "is delegates to controller" do
+        controller = double("controller")
+        controller.should_receive(:running?).and_return('running?')
+        @controller.stub(:controller).and_return(controller)
+        @controller.running?.should == "running?"
+      end
+    end
+  end
+
   describe "#controller" do
     it "instantiates a DaemonController" do
       @controller.stub(:identifier).and_return("identifier")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Justin Marney