artifact 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c348cf5a979b4783fcc7dac983aa9303b6dcd4b
-  data.tar.gz: 7ccaf7b5fc8a0de2e3e03475aec6984d91caa29a
+  metadata.gz: df6c17de9ae37b3707264d2f62414ed0fe9f8e9c
+  data.tar.gz: fcb141f55a2c48dfe223adea3ab46bec98bec9f3
 SHA512:
-  metadata.gz: 65d5d7b47c54a0358677c94995c49048d197cceaa61f4c31917d1bf06922cc110fd941dc835a83a3fa7f4d68c097c15f0ede2fc45d50f57c8f1f02274e575707
-  data.tar.gz: 00e6f8988cff7d4083e6f3af328bb94edb6747411c2bfdca3ce7452be0a426207d89fc5d14ced6046056062a3eab8980a0a2040deef5e4066605082307362fac
+  metadata.gz: 0d87193120f88d5d5a4b8bf8985fa4e62484836edfcc8ff8f0af29f1692fd7b952623ac83721c6f601248d280d39068ca75bd41551cc1735ad78747368c30455
+  data.tar.gz: fe4094136b744706f109e7096b0d9e60dbe1eeadab3d738ab400558ba7c57e94eae8cb2d7b272feca9534e896d3dab0b7a929f66a585eb3705b97b2501f50a2e

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Tomás Pollak
+Copyright (c) 2014-2016 Tomas Pollak
 
 MIT License
 

data/bin/artifact

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'artifact/cli'
+require_relative '../lib/artifact/cli'
 Artifact::CLI.start

data/lib/artifact.rb

@@ -69,7 +69,7 @@ module Artifact
     attr_accessor *%w(
       root source_root posts_path drafts_path uploads_path
       directory_indexes rebuild_args author_name author_email
-      before_update after_update
+      before_update after_update before_push after_push
     )
 
     def initialize
@@ -147,6 +147,8 @@ module Artifact
 
   class Repo
 
+    class SyncError < RuntimeError; end
+
     def initialize(full_path)
       @root = full_path
       @git = Rugged::Repository.new(full_path)
@@ -187,6 +189,13 @@ module Artifact
       !!file_status(path) rescue false
     end
 
+    def sync!
+      code, out = pull
+      raise SyncError.new("Error when pulling changes: #{out.strip}") unless code == 0
+      code, out = push
+      raise SyncError.new("Error when pushing changes: #{out.strip}") unless code == 0
+    end
+
     private
 
     def new_file?(file_path)
@@ -206,6 +215,8 @@ module Artifact
     # the author signature is a Hash containing :name, :email of the author
     # and :time of the change.
     def write_commit(message, author)
+      Artifact.run_hook(:before_commit, message)
+
       author[:time] = Time.now
       commit_sha = Rugged::Commit.create(@git,
         :author     => author,
@@ -215,6 +226,37 @@ module Artifact
         :tree       => @git.index.write_tree,
         :update_ref => 'HEAD'
       )
+
+      Artifact.run_hook(:after_commit, message)
+    end
+
+    def pull
+      # updated = false
+      code, out = nil, nil
+      Dir.chdir(@root) do
+        out  = `git pull --rebase`
+        code = $? 
+        # updated = out.strip != 'Current branch master is up to date.'
+        # updated = res.strip != 'Already up-to-date.'
+      end
+      # updated
+      return code, out
+    end
+
+    def push
+      Artifact.run_hook(:before_push)
+
+      # updated = false
+      code, out = nil, nil
+      Dir.chdir(@root) do
+        out  = `git push`
+        code = $?
+        # updated = out.strip != 'Everything up-to-date'
+      end
+
+      Artifact.run_hook(:after_push)
+      # updated
+      return code, out
     end
 
   end

data/lib/artifact/cli.rb

@@ -0,0 +1,12 @@
+module Artifact
+
+  class CLI
+
+    def self.start
+      puts "Not ready yet, sorry"
+      exit 1
+    end
+  
+  end
+
+end

data/lib/artifact/middleman.rb

@@ -67,6 +67,15 @@ module Artifact
       redirect to('/')
     end
 
+    post '/sync' do
+      begin
+        Artifact.repo.sync!
+        redirect to('/')
+      rescue Artifact::Repo::SyncError => e
+        redirect to('/?error=' + e.message)
+      end
+    end
+
     get '/search' do
       if params[:q].present?
         normalized = params[:q].gsub(' ', '-').downcase
@@ -241,7 +250,7 @@ module Artifact
       Artifact.middleman.sitemap.rebuild_resource_list!
 
       if Artifact.middleman.extensions[:frontmatter]
-        puts "Flushing frontmatter cache..."
+        # puts "Flushing frontmatter cache..."
         Artifact.middleman.extensions[:frontmatter].flush_cache!
       end
     end

data/lib/artifact/version.rb

@@ -1,3 +1,3 @@
 module Artifact
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/artifact/views/layout.erb

@@ -12,7 +12,7 @@
   <meta name="author" content="Fork Ltd.">
 
   <!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-    <link href='http://fonts.googleapis.com/css?family=Lato:300,900|Asap|Titillium+Web' rel='stylesheet' type='text/css' />
+  <link href='http://fonts.googleapis.com/css?family=Lato:300,900|Asap|Titillium+Web' rel='stylesheet' type='text/css' />
   <link rel="stylesheet" href="http://tomas.github.io/base.css/build/base-min.css" type="text/css" media="screen" />
   <link rel="stylesheet" href="<%= url('/css/main.css') %>" type="text/css" media="screen" charset="utf-8" />
 

data/lib/artifact/views/posts/edit.erb

@@ -10,6 +10,7 @@
          type="text"
          name="meta[title]"
          value="<%= @post.title %>"
+         maxlength="120"
          placeholder="Title here" />
 
   <textarea

data/lib/artifact/views/posts/index.erb

@@ -7,6 +7,10 @@
     <ul class="right menu menu-horizontal">
       <li><a target="_blank" class="btn" href="/">View site</a></li>
 
+      <form method="post" class="inline" action="<%= url('/sync') %>">
+        <li><button class="btn btn-success" type="submit">Sync repo</button></li>
+      </form>
+
       <form method="post" class="inline" action="<%= url('/build') %>">
         <li><button class="btn btn-danger" type="submit">Rebuild!</button></li>
       </form>

data/scaffold/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'artifact', path: '..'
+gem 'middleman'
+gem 'middleman-blog'
+

data/scaffold/config.ru

@@ -0,0 +1,29 @@
+# you would normally run this only on development
+# then upload and rebuild your website using `bundle exec middleman build`
+
+# require 'bundler/setup'
+require 'middleman'
+require 'middleman-blog'
+
+require 'artifact'
+require 'artifact/middleman'
+
+# all available options for artifact
+Artifact.configure do |config|
+  config.source_root  = 'source'  # everything else should be under this dir
+  config.uploads_path = 'uploads'
+  config.drafts_path  = 'drafts'
+  config.posts_path   = 'posts'
+  config.author_name  = 'Your Name'
+  config.author_email = 'your@email.com'
+  config.rebuild_args = '--no-clean'
+end
+
+map('/admin') do
+  run Artifact::Middleman
+end
+
+map('/') do
+  use WhateverMiddleware
+  run Middleman::Application.server # so we can see the live website
+end

data/scaffold/source/layout.html

@@ -0,0 +1,7 @@
+<html>
+<head>
+  <title>Test site</title>
+</head>
+<body>
+<%= yield %>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artifact
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - bin/artifact
 - lib/artifact.rb
 - lib/artifact/app.rb
+- lib/artifact/cli.rb
 - lib/artifact/files.rb
 - lib/artifact/helpers.rb
 - lib/artifact/middleman.rb
@@ -151,6 +152,9 @@ files:
 - lib/artifact/views/shared/_menu.erb
 - lib/artifact/views/uploads/_form.erb
 - lib/artifact/views/uploads/_list.erb
+- scaffold/Gemfile
+- scaffold/config.ru
+- scaffold/source/layout.html
 homepage: ''
 licenses:
 - MIT
@@ -171,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Frontend UI for git blogging.
 test_files: []
-has_rdoc: