hastie 0.2.0 → 1.1.2

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "jekyll", :git => "git://github.com/vlandham/jekyll.git"
+gem "jekyll", :git => "git://github.com/metalhelix/jekyll.git"
 
 group :test do
   gem 'fakefs', require: "fakefs/safe"

data/README.textile

@@ -18,17 +18,38 @@ This creates a @.hastie@ file in your home directory. The @-a@ flag indicates th
 
 h3. hastie create
 
-Now you are ready to generate a new report. Navigate to the directory that you would like the report to be created in, and create it with @hastie create@:
+Now you are ready to generate a new report. Navigate to your base project directory, and create it with @hastie create@:
 
 <pre>
 cd /path/to/report/base
-hastie create analysis_of_sample_x -r ada -p hym
+hastie create -i cbio_101 -r ada -p hym
 </pre>
 
-This will create a new directory called @report@ with your new report inside. The flags set meta data about the report. @-r@ for the researcher this report is for and @-p@ for the PI or lead researcher of the researcher specified by @-r@. These flags are optional. This data can be easily added later to your report if you forget.
+This will create a new directory called @cbio_101@ with a series of directories inside it. The flags set meta data about the report. @-r@ for the researcher this report is for and @-p@ for the PI or lead researcher of the researcher specified by @-r@.
+
+The Project directory, @cbio_101@ will now contain these sub-directories:
+
+<pre>
+ --cbio_101
+  |
+  |__ report
+  |
+  |__ data
+  |   |
+  |   |__ input
+  |   |
+  |   |__ output
+  |
+  |__ code
+  |
+  |__ notes
+
+</pre>
 
 Inside your report directory will be a number of files and sub-directories to get your report started. Many of these files are copied directly from the server you supplied in your config file.
 
+You can generate *just* the report directory by using the @--only-report@ flag.
+
 h3. hastie watch
 
 Now start editing your report. It will be inside your @report@ directory, and be named @date_report_name.textile@. Watch changes to your report as you modify this file using @hastie watch@:

data/bin/hastie

@@ -53,6 +53,11 @@ create_server options:
         Hastie::ConfigGenerator.start ARGV
       when "create_server","server_start"
         Hastie::ServerGenerator.start ARGV
+      when "overview"
+        id = Time.now.strftime('%b_%Y')
+        options = ["--template","overview","--id", id, "--output", id, "--only_report", "--pi", "cbio", "--researcher", "cbio"]
+        options.concat(ARGV)
+        Hastie::ReportGenerator.start options
       else
         puts Hastie::Executable::HELP
       end

data/lib/hastie/constants.rb

@@ -6,6 +6,8 @@ module Hastie
 
   DATA_ROOT = "data"
   REPORT_CONFIG_FILE = "report.yml"
+  DEFAULT_REPORT_DIR = "report"
+  DEFAULT_ID_DOMAIN = "cbio"
 
   def self.config_file
     CONFIG_FILE
@@ -22,4 +24,12 @@ module Hastie
   def self.publish_config_file
     SERVER_PUBLISH_CONFIG_FILE
   end
+
+  def self.default_report_dir
+    DEFAULT_REPORT_DIR
+  end
+
+  def self.id_domain
+    DEFAULT_ID_DOMAIN
+  end
 end

data/lib/hastie/id_server.rb

@@ -0,0 +1,20 @@
+require 'json'
+
+module Hastie
+  class IdServer
+    attr_accessor :root_url, :domain
+    def initialize url = "", domain = "cbio"
+      self.root_url = url
+      self.domain = domain
+    end
+
+    def request_id pi, researcher
+      request = {"issuer" => domain, "lab" => pi, "sponsor" => researcher, "project" =>
+        {"description" => "new project"}}.to_json
+      command = "curl -H \"Accept: application/json\" -H \"Content-type: application/json\" -X POST -d"
+      "#{self.domain}.tst.100 -d '#{request.to_s}' #{url}/projects"
+      puts command
+      "cbio.tst.1000"
+    end
+  end
+end

data/lib/hastie/report_generator.rb

@@ -1,42 +1,89 @@
 require 'fileutils'
 require 'hastie/config_file'
 require 'hastie/constants'
+require 'hastie/id_server'
 require 'hastie/server_reader'
 
 module Hastie
   class ReportGenerator < ServerReader
     def self.banner
-      "hastie create [NAME] <OPTIONS>"
+      "hastie create -p [PI] -r [RESERACHER] <OPTIONS>"
     end
 
-    attr_accessor :report_id, :title, :analyst, :researcher, :pi
+    attr_accessor :report_id, :title, :researcher, :pi
 
     desc "Creates framework for new report"
-    argument :name, :type => :string, :desc => "The name of the new report. no spaces"
+    class_option :id, :aliases => "-i", :type => :string, :desc => "Overrides using ID server. Provide custom ID."
+    class_option :pi, :aliases => "-p", :required => true, :desc => "PI the researcher is under"
+    class_option :researcher, :aliases => "-r", :required => true, :desc => "Researcher the report is for"
     class_option :type, :aliases => "-t", :desc => "Type of report to generate"
+    class_option :template, :desc => "Template to use for creating report", :default => "report"
     class_option :analyst, :aliases => "-a", :desc => "Analyst generating the report"
-    class_option :researcher, :aliases => "-r", :desc => "Researcher the report is for"
-    class_option :pi, :aliases => "-p", :desc => "PI the researcher is under"
     class_option :date, :aliases => "-d", :desc => "Date to use in report filename. Ex: 2011-11-29", :default => "#{Time.now.strftime('%Y-%m-%d')}"
-    class_option :output, :aliases => "-o", :desc => "Output Directory for report", :default => File.join(".", "report")
+    class_option :output, :aliases => "-o", :desc => "Output Directory for report"
+
+    class_option :id_server, :desc => "URL of ID server to use"
+    class_option :id_domain, :desc => "ID domain to use", :default => Hastie.id_domain
+
+    class_option :only_report, :type => :boolean, :desc => "Only output report and not rest of directory structure", :default => false
+
+    def setup_id
+      if !options[:id]
+        if options[:id_server] and options[:id_domain]
+          id_server = Hastie::IdServer.new(options[:id_server], options[:id_domain])
+          self.report_id = id_server.request_id(options[:pi], options[:researcher])
+          options[:id] = self.report_id
+        else
+          say_status "error", "No ID server found", :red
+          say_status "error", " Provide --id_server and --id_domain", :red
+          say_status "error", " Or use --id to specify the ID of your report", :red
+          exit(1)
+        end
+      else
+        self.report_id = options[:id]
+      end
+      options[:name] = options[:id]
+
+      say_status "note", "id: #{options[:id]}"
+      say_status "note", "name: #{options[:name]}"
+    end
+
+    # output directory now means two different things depending on :only_report
+    # :only_report = true then :output means name of the report directory
+    # :only_report = false then :output means the starting location for the
+    #   project directory structure
+    def setup_destination
+      if options[:only_report]
+        if !options[:output]
+          options[:output] = File.join(".", Hastie.default_report_dir)
+        end
+        self.destination_root = options[:output]
+      else
+        if !options[:output]
+          options[:output] = "."
+        end
+        self.destination_root = File.join(options[:output], options[:id])
+      end
+
+      say_status "note", "root: #{self.destination_root}"
+    end
+
+    def create_directory_structure
+      unless options[:only_report]
+        directory(File.join("templates", "project"), self.destination_root)
+        self.destination_root = File.join(self.destination_root, Hastie.default_report_dir)
+      end
+    end
 
     def setup_variables
+      options[:pi] ||= "cbio"
+      options[:researcher] ||= "cbio"
       options[:type] ||= "textile"
       options[:date] ||= "#{Time.now.strftime('%Y-%m-%d')}"
-      options[:name] = File.basename(name)
       self.title = options[:name].gsub("_", " ").capitalize
       options[:title] = self.title
-      # report_id will be used internally in case the name turns
-      # out to be too loose to use
-      self.report_id = File.basename(name)
-      options[:report_id] = self.report_id
-      self.destination_root = options[:output]
-      say_status "note", "root: #{self.destination_root}"
 
-      options[:analyst] ||= "unknown"
-      self.analyst = options[:analyst] || "unknown"
-      options[:researcher] ||= "unknown"
-      options[:pi] ||= "unknown"
+      options[:analyst] ||= "cbio"
       options[:data_dir] ||= data_dir
     end
 
@@ -57,10 +104,15 @@ module Hastie
     end
 
     def create_report_file
-      say_status "create", "report: #{options[:report_id]}"
+      say_status "create", "report: #{options[:id]}"
       extension = determine_extension(options[:type])
+      template_name = options[:template]
       options[:extension] = extension
-      template_file = "templates/report.#{extension}.tt"
+      template_file = "templates/#{template_name}.#{extension}.tt"
+      if !File.exists? File.join(File.dirname(__FILE__), template_file)
+        say_status "error", "#{template_file} not present. Invalid Template.", :red
+        exit(1)
+      end
       report_filename = "#{options[:date]}-#{report_id}.#{extension}"
       say_status  "note", "report file: #{report_filename}"
       template template_file, report_filename
@@ -111,7 +163,7 @@ module Hastie
       end
 
       def data_dir
-        File.join(DATA_ROOT, options[:report_id])
+        File.join(DATA_ROOT, options[:id])
       end
     end
   end

data/lib/hastie/report_publisher.rb

@@ -54,6 +54,18 @@ module Hastie
       say_status "note", "root: #{self.destination_root}"
     end
 
+    def create_lock_file
+      lock_file = File.join(self.destination_root, "lock.txt")
+      if File.exists?(lock_file)
+        say_status "error", "Another user is currently publishing to server", :red
+        say_status "error", "Please wait", :red
+        exit(1)
+      end
+      File.open(lock_file, 'w') do |file|
+        file.puts Time.now.strftime('%Y-%m-%d %H:%M')
+      end
+    end
+
     def copy_report_file
       report_filename = options[:local]["report_file"]
       local_report = File.join(report_dir, report_filename)
@@ -122,25 +134,25 @@ module Hastie
       end
     end
 
-    def update_git_repo
-      in_root do
-        say_status "note", "updating git repository"
-        Grit::Git.git_timeout = 25
-        repo = Grit::Repo.new(".")
-        # ensure we are on the server branch
-        repo.git.native :checkout, {}, 'server'
-        repo = Grit::Repo.new(".")
-        if repo.head.name != "server"
-          say_status "error", "Remote git not on server branch", :red
-          say_status "error", "Please git checkout server", :red
-          say_status "error", "Current branch: #{repo.head.name}", :red
-          exit(1)
-        end
-        all_files = Dir.glob("./**")
-        repo.add(all_files)
-        repo.commit_all("update with report: #{options[:local]["report_id"]}")
-      end
-    end
+    # def update_git_repo
+    #   in_root do
+    #     say_status "note", "updating git repository"
+    #     Grit::Git.git_timeout = 25
+    #     repo = Grit::Repo.new(".")
+    #     # ensure we are on the server branch
+    #     repo.git.native :checkout, {}, 'server'
+    #     repo = Grit::Repo.new(".")
+    #     if repo.head.name != "server"
+    #       say_status "error", "Remote git not on server branch", :red
+    #       say_status "error", "Please git checkout server", :red
+    #       say_status "error", "Current branch: #{repo.head.name}", :red
+    #       exit(1)
+    #     end
+    #     all_files = Dir.glob("./**")
+    #     repo.add(all_files)
+    #     repo.commit_all("update with report: #{options[:local]["report_id"]}")
+    #   end
+    # end
 
     def publish_with_jekyll
       in_root do
@@ -158,5 +170,10 @@ module Hastie
         Process.waitpid(pid)
       end
     end
+
+    def remove_lock_file
+      lock_file = File.join(self.destination_root, "lock.txt")
+      system("rm -f #{lock_file}")
+    end
   end
 end

data/lib/hastie/server_reader.rb

@@ -7,13 +7,13 @@ require 'hastie/constants'
 module Hastie
   class ServerReader < Thor::Group
     include Thor::Actions
-    class_option :server_root, :aliases => "-s", :desc => "Root directory of the server to read / publish to"
     class_option :config_file, :aliases => "-c", :desc => "Path to .hastie config file", :default => Hastie.config_file
+    class_option :server_root, :aliases => "-s", :desc => "Root directory of the server to read / publish to"
 
     no_tasks do
       def config_file
         @config_file ||= if options[:config_file]
-                           File.expand_path(options[:config_file]) 
+                           File.expand_path(options[:config_file])
                            else
                              Hastie.config_file
                            end

data/lib/hastie/templates/overview.textile.tt

@@ -0,0 +1,47 @@
+---
+layout: overview
+type: overview
+title: <%= title %>
+analyst: <%= options[:analyst] %>
+researcher: <%= options[:researcher] %> 
+pi: <%= options[:pi] %>
+data:
+- <%= options[:data_dir] %>/
+---
+
+h2. Overview Period:
+
+<div class="note">
+*SUMMARY*
+
+</div>
+
+h3. New Projects
+
+{% table csv class = overview, format = textile %}
+PI, description, lead, report, comments, end date
+
+{% endtable %}
+
+
+h3. Ongoing Projects
+
+{% table csv class = overview, format = textile %}
+PI, description, lead, report, comments, end date
+
+{% endtable %}
+
+h3. Finished Projects
+
+{% table csv class = overview, format = textile %}
+PI, description, lead, report, comments, end date
+
+{% endtable %}
+
+h3. Pending Projects
+
+{% table csv class = overview, format = textile %}
+PI, description, lead, report, comments, end date
+
+{% endtable %}
+

data/lib/hastie/version.rb

@@ -1,3 +1,3 @@
 module Hastie
-  VERSION = "0.2.0".freeze
+  VERSION = "1.1.2".freeze
 end

data/spec/report_generator_spec.rb

@@ -4,8 +4,16 @@ require 'hastie/report_generator'
 
 class ReportGeneratorChild < Hastie::ReportGenerator
   no_tasks do
-    def config_file
-      FakeFsHelper::CONFIG_FILE
+  def config_file
+    FakeFsHelper::CONFIG_FILE
+  end
+  end
+end
+
+module Hastie
+  class IdServer
+    def request_id researcher, pi
+      "cbio.#{researcher}.1000"
     end
   end
 end
@@ -25,111 +33,162 @@ describe Hastie::ReportGenerator do
     @server_dir = File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "server"))
     @output_dir = File.expand_path(File.join(File.dirname(__FILE__), "sandbox"))
     @date = "2011-11-31"
-    @input = ["sandbox", "-o", @output_dir, "--config_file", @config_file, "--server_root", @server_dir, "--date", @date]
-    @expected_report_name = File.join(@output_dir, "#{@date}-#{File.basename(@output_dir)}")
   end
 
   after :each do
     FileUtils.rm_r @output_dir if File.exists?(@output_dir)
   end
 
-  it "should create scaffold files in output directory" do
-    content = capture(:stdout) do
-      lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+  describe "project directory generation" do
+    before :each do
+      @report_id = "test.test.100"
+      @input = ["-i", @report_id, "-p", "ppp", "-r", "rrr", "-o", @output_dir, "--config_file", @config_file, "--server_root", @server_dir, "--date", @date]
+      @expected_report_name = File.join(@output_dir,@report_id, "report", "#{@date}-#{File.basename(@report_id)}")
     end
 
-    File.exists?(@expected_report_name + ".textile").should == true
-    File.directory?(File.join(@output_dir, "data")).should == true
-    File.directory?(File.join(@output_dir, "data", File.basename(@output_dir))).should == true
-    File.directory?(File.join(@output_dir, "_layouts")).should == true
-    File.directory?(File.join(@output_dir, "css")).should == true
-    File.directory?(File.join(@output_dir, "js")).should == true
-    File.directory?(File.join(@output_dir, "_plugins")).should == true
-    File.directory?(File.join(@output_dir, "_includes")).should == true
-    File.exists?(File.join(@output_dir, "_config.yml")).should == true
-    File.exists?(File.join(@output_dir, "report.yml")).should == true
-    File.exists?(File.join(@output_dir, "index.html")).should == true
-  end
-
-  it "should provide link in index file to html page" do
-    content = capture(:stdout) do
-      lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+    after :each do
+      FileUtils.rm_r @output_dir if File.exists?(@output_dir)
     end
 
-    index_file = File.join(@output_dir, "index.html")
-    File.exists?(index_file).should == true
+    it "should create scaffold files in output directory" do
+      content = capture(:stdout) do
+        lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+      end
 
-    index_content = read_file index_file
+      File.exists?(File.join(@output_dir)).should == true
+      File.exists?(File.join(@output_dir,@report_id)).should == true
+      File.exists?(File.join(@output_dir,@report_id, "report")).should == true
+      File.exists?(@expected_report_name + ".textile").should == true
 
-    index_content.should match /url=#{File.basename(@expected_report_name)}.html/
+      File.exists?(File.join(@output_dir,@report_id,"data")).should == true
+    end
 
   end
 
-  ["markdown", "textile"].each do |format|
-    it "should have default content" do
-      @input << "--type" << format
+  describe "create overview page" do
+
+    before :each do
+      @input = ["--template", "overview", "-i", "sandbox", "-p", "ppp", "-r", "rrr", "-o", @output_dir, "--config_file", @config_file, "--server_root", @server_dir, "--date", @date, "--only_report"]
+      @expected_report_name = File.join(@output_dir, "#{@date}-#{File.basename(@output_dir)}")
+    end
+
+
+    it "should create scaffold files in output directory" do
       content = capture(:stdout) do
         lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
       end
 
-      report_file = File.join(@expected_report_name + "." + format)
-      File.exists?(report_file).should == true
-      report_file_content = read_file report_file
-
-      report_file_content.should match /layout: report/
-      report_file_content.should match /title: Sandbox/
-      report_file_content.should match /data:/
-      report_file_content.should match /- data\/#{File.basename(@output_dir)}/
+      File.exists?(@expected_report_name + ".textile").should == true
     end
   end
 
-  describe "input options" do
-    it "--type" do
-      @input << "--type" << "markdown"
+  describe "basic functionality" do
+
+    before :each do
+      @input = ["-i", "sandbox", "-p", "ppp", "-r", "rrr", "-o", @output_dir, "--config_file", @config_file, "--server_root", @server_dir, "--date", @date, "--only_report"]
+      @expected_report_name = File.join(@output_dir, "#{@date}-#{File.basename(@output_dir)}")
+    end
+
+
+    it "should create scaffold files in output directory" do
       content = capture(:stdout) do
         lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
       end
 
-      File.exists?(File.join(@expected_report_name + ".markdown")).should == true
+      File.exists?(@expected_report_name + ".textile").should == true
+      File.directory?(File.join(@output_dir, "data")).should == true
+      File.directory?(File.join(@output_dir, "data", File.basename(@output_dir))).should == true
+      File.directory?(File.join(@output_dir, "_layouts")).should == true
+      File.directory?(File.join(@output_dir, "css")).should == true
+      File.directory?(File.join(@output_dir, "js")).should == true
+      File.directory?(File.join(@output_dir, "_plugins")).should == true
+      File.directory?(File.join(@output_dir, "_includes")).should == true
+      File.exists?(File.join(@output_dir, "_config.yml")).should == true
+      File.exists?(File.join(@output_dir, "report.yml")).should == true
+      File.exists?(File.join(@output_dir, "index.html")).should == true
     end
 
-    it "--analyst" do
-      @input << "--analyst" << "mcm"
+    it "should provide link in index file to html page" do
       content = capture(:stdout) do
         lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
       end
-      report_file = File.join(@expected_report_name + ".textile")
 
-      File.exists?(report_file).should == true
-      report_file_content = read_file report_file
+      puts content
+      index_file = File.join(@output_dir, "index.html")
+      File.exists?(index_file).should == true
+
+      index_content = read_file index_file
+
+      index_content.should match /url=#{File.basename(@expected_report_name)}.html/
 
-      report_file_content.should match /analyst: mcm/
     end
 
-    it "--pi" do
-      @input << "--pi" << "dad"
-      content = capture(:stdout) do
-        lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+    ["markdown", "textile"].each do |format|
+      it "should have default content" do
+        @input << "--type" << format
+        content = capture(:stdout) do
+          lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+        end
+
+        report_file = File.join(@expected_report_name + "." + format)
+        File.exists?(report_file).should == true
+        report_file_content = read_file report_file
+
+        report_file_content.should match /layout: report/
+        report_file_content.should match /title: Sandbox/
+        report_file_content.should match /data:/
+        report_file_content.should match /- data\/#{File.basename(@output_dir)}/
       end
-      report_file = File.join(@expected_report_name + ".textile")
+    end
 
-      File.exists?(report_file).should == true
-      report_file_content = read_file report_file
+    describe "input options" do
+      it "--type" do
+        @input << "--type" << "markdown"
+        content = capture(:stdout) do
+          lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+        end
 
-      report_file_content.should match /pi: dad/
-    end
+        File.exists?(File.join(@expected_report_name + ".markdown")).should == true
+      end
 
-    it "--researcher" do
-      @input << "--researcher" << "odd"
-      content = capture(:stdout) do
-        lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+      it "--analyst" do
+        @input << "--analyst" << "mcm"
+        content = capture(:stdout) do
+          lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+        end
+        report_file = File.join(@expected_report_name + ".textile")
+
+        File.exists?(report_file).should == true
+        report_file_content = read_file report_file
+
+        report_file_content.should match /analyst: mcm/
       end
-      report_file = File.join(@expected_report_name + ".textile")
 
-      File.exists?(report_file).should == true
-      report_file_content = read_file report_file
+      it "--pi" do
+        @input << "--pi" << "dad"
+        content = capture(:stdout) do
+          lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+        end
+        report_file = File.join(@expected_report_name + ".textile")
 
-      report_file_content.should match /researcher: odd/
+        File.exists?(report_file).should == true
+        report_file_content = read_file report_file
+
+        report_file_content.should match /pi: dad/
+      end
+
+      it "--researcher" do
+        @input << "--researcher" << "odd"
+        content = capture(:stdout) do
+          lambda { Hastie::ReportGenerator.start @input }.should_not raise_error SystemExit
+        end
+        report_file = File.join(@expected_report_name + ".textile")
+
+        File.exists?(report_file).should == true
+        report_file_content = read_file report_file
+
+        report_file_content.should match /researcher: odd/
+      end
     end
   end
 end
@@ -149,7 +208,7 @@ describe Hastie::ReportGenerator, fakefs: true do
       FakeFsHelper.add_published_report project
 
       content = capture(:stdout) do
-        lambda { ReportGeneratorChild.start [project] }.should raise_error SystemExit
+        lambda { ReportGeneratorChild.start ["-i", project, "-p", "ppp", "-r", "rrr", "--only_report"]}.should raise_error SystemExit
       end
       content.should match /#{project} is already/
     end

data/spec/report_publisher_spec.rb

@@ -30,13 +30,13 @@ describe Hastie::ReportPublisher do
     FileUtils.cp_r @org_report_dir, @report_dir
 
     @report_name = File.basename(Dir.glob(File.join(@report_dir, "*.textile"))[0])
-    FileUtils.cd(@server_dir) do
-      system("git init .")
-      system("git add .")
-      system("git commit -m \"initial commit\"")
-      system("git branch server")
-      system("git checkout server")
-    end
+    # FileUtils.cd(@server_dir) do
+    #   system("git init .")
+    #   system("git add .")
+    #   system("git commit -m \\"initial commit\\"")
+    #   system("git branch server")
+    #   system("git checkout server")
+    # end
 
     @input = [@report_dir, "--config_file", @config_file, "--server_root", @server_dir]
   end
@@ -54,6 +54,17 @@ describe Hastie::ReportPublisher do
     File.exists?(File.join(@server_dir, "data", "report")).should == true
   end
 
+  it "should prevent publish when lock file is present" do
+    lock_file = File.join(@server_dir, "lock.txt")
+    system("touch #{lock_file}")
+    content = capture(:stdout) do
+      lambda { Hastie::ReportPublisher.start @input }.should raise_error SystemExit
+    end
+
+    File.exists?(File.join(@server_dir, "_posts", @report_name)).should_not == true
+    File.exists?(File.join(@server_dir, "data", "report")).should_not == true
+  end
+
   it "should add report to _reports.yml" do
     content = capture(:stdout) do
       lambda { Hastie::ReportPublisher.start @input }.should_not raise_error SystemExit
@@ -62,14 +73,14 @@ describe Hastie::ReportPublisher do
     reports_content.should match /#{File.basename(@report_dir)}/
   end
 
-  it "should update git repository with new commit" do
-    content = capture(:stdout) do
-      lambda { Hastie::ReportPublisher.start @input }.should_not raise_error SystemExit
-    end
+  # it "should update git repository with new commit" do
+  #   content = capture(:stdout) do
+  #     lambda { Hastie::ReportPublisher.start @input }.should_not raise_error SystemExit
+  #   end
 
-    commits = Grit::Repo.new(@server_dir).commits('server',1)
-    commits[0].message.should match /update with report: report/
-  end
+  #   commits = Grit::Repo.new(@server_dir).commits('server',1)
+  #   commits[0].message.should match /update with report: report/
+  # end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hastie
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000Z
+date: 2012-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &3725550 !ruby/object:Gem::Requirement
+  requirement: &70147378031820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *3725550
+  version_requirements: *70147378031820
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &3725300 !ruby/object:Gem::Requirement
+  requirement: &70147378029960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *3725300
+  version_requirements: *70147378029960
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &3725070 !ruby/object:Gem::Requirement
+  requirement: &70147378027680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *3725070
+  version_requirements: *70147378027680
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &3724840 !ruby/object:Gem::Requirement
+  requirement: &70147378009460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *3724840
+  version_requirements: *70147378009460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &3724610 !ruby/object:Gem::Requirement
+  requirement: &70147378008760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *3724610
+  version_requirements: *70147378008760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &3724380 !ruby/object:Gem::Requirement
+  requirement: &70147378007680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.9'
   type: :development
   prerelease: false
-  version_requirements: *3724380
+  version_requirements: *70147378007680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &3724150 !ruby/object:Gem::Requirement
+  requirement: &70147378006300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *3724150
+  version_requirements: *70147378006300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &3723920 !ruby/object:Gem::Requirement
+  requirement: &70147378005120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *3723920
+  version_requirements: *70147378005120
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &3723690 !ruby/object:Gem::Requirement
+  requirement: &70147378004140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *3723690
+  version_requirements: *70147378004140
 description: ''
 email: none@none.com
 executables:
@@ -132,6 +132,7 @@ files:
 - lib/hastie/config_file.rb
 - lib/hastie/config_generator.rb
 - lib/hastie/constants.rb
+- lib/hastie/id_server.rb
 - lib/hastie/report_generator.rb
 - lib/hastie/report_publisher.rb
 - lib/hastie/report_updater.rb
@@ -139,6 +140,12 @@ files:
 - lib/hastie/server_generator.rb
 - lib/hastie/server_reader.rb
 - lib/hastie/templates/hastie_config.tt
+- lib/hastie/templates/overview.textile.tt
+- lib/hastie/templates/project/code/.gitignore
+- lib/hastie/templates/project/code/analysis.R
+- lib/hastie/templates/project/data/input/.gitignore
+- lib/hastie/templates/project/data/output/.gitignore
+- lib/hastie/templates/project/notes/notes.txt
 - lib/hastie/templates/report.markdown.tt
 - lib/hastie/templates/report.textile.tt
 - lib/hastie/templates/report_index.html.tt
@@ -167,6 +174,9 @@ files:
 - spec/fixtures/report/js/.gitignore
 - spec/fixtures/report/report.yml
 - spec/fixtures/server/_config.yml
+- spec/fixtures/server/_includes/.gitignore
+- spec/fixtures/server/_layouts/.gitignore
+- spec/fixtures/server/_plugins/.gitignore
 - spec/fixtures/server/_posts/2011-11-11-jfv_mak_snp_analysis.textile
 - spec/fixtures/server/_reports.yml
 - spec/fixtures/server/css/style.css
@@ -202,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ''
@@ -218,6 +228,9 @@ test_files:
 - spec/fixtures/report/js/.gitignore
 - spec/fixtures/report/report.yml
 - spec/fixtures/server/_config.yml
+- spec/fixtures/server/_includes/.gitignore
+- spec/fixtures/server/_layouts/.gitignore
+- spec/fixtures/server/_plugins/.gitignore
 - spec/fixtures/server/_posts/2011-11-11-jfv_mak_snp_analysis.textile
 - spec/fixtures/server/_reports.yml
 - spec/fixtures/server/css/style.css