web_translate_it 1.8.4 → 1.9.0

data/bin/wti

@@ -17,7 +17,6 @@ The most commonly used wti commands are:
   match       Display matching of local files with File Manager
   add         Create and push a new master language file
   addlocale   Add a new locale to the project
-  server      Start a synchronisation server
   status      Fetch and display project statistics
   init        Configure your project to sync      
 
@@ -79,7 +78,8 @@ EOS
   when "server"
     Trollop::options do
       banner <<-EOS
-Start a synchronisation server
+Deprecated, used to start a synchronisation server.
+`gem install web_translate_it_server` and run `wti-server` instead.
 [options] are:
 EOS
       opt :port, "Run server on a specific port", :default => 4000, :short => "-p"

data/history.md

@@ -1,3 +1,7 @@
+## Version 1.9.0 / 2011-11-23
+
+* Deprecate `wti server`. This feature was introducing a hard dependency on Sinatra, which is not desirable when embedding `web_translate_it` on a Rails application. `wti server` now lives in a separate gem, `web_translate_it_server`, which depends on the `web_translate_it` gem. To keep using `wti server`, execute: `gem install web_translate_it_server` and run: `wti-server`. 
+
 ## Version 1.8.4 / 2011-11-14
 
 * Add new command `wti rmlocale locale_code_1 locale_code_2 ...` to delete a locale from a project.

data/lib/web_translate_it.rb

@@ -8,7 +8,6 @@ require 'web_translate_it/translation_file'
 require 'web_translate_it/auto_fetch'
 require 'web_translate_it/command_line'
 require 'web_translate_it/project'
-require 'web_translate_it/server'
 
 module WebTranslateIt
   

data/lib/web_translate_it/command_line.rb

@@ -180,7 +180,10 @@ module WebTranslateIt
     alias :st :status
     
     def server
-      WebTranslateIt::Server.start(command_options.host, command_options.port)
+      puts "This feature is deprecated and was extracted to a separate gem,"
+      puts "    `web_translate_it_server`."
+      puts "To use it, run `gem install web_translate_it_server`"
+      puts "and run the server with `wti-server`."
     end
     
     def method_missing(m, *args, &block)

data/readme.md

@@ -163,24 +163,7 @@ Check the [sample `.wti`](https://github.com/AtelierConvivialite/webtranslateit/
 Web Translate It Synchronisation Console
 ----------------------------------------
 
-![Web Translate It](http://f.cl.ly/items/2Z413Q3A2b331c0O2m04/wti_server.png)
-
-`wti` contains a server you can use to run a friendly web interface to sync your translations. It allows a translation team to refresh the language files on a staging server without asking the developers to manually `wti pull`.
-
-To get started, go to the directory of the application you want to sync and do:
-
-    wti server
-
-By default, it starts an application on localhost on the port 4000. You will find the tool on `http://localhost:4000`.
-
-Should you need to use another host or port, you can use the `-h` and `-p` options. For example: `wti server -p 1234`.
-
-You may want to run some commands before or after syncing translations. You can use the hooks to do so. For instance, you could add the following in your `.wti` file:
-
-    before_pull: "echo 'some unix command'"
-    after_pull:  "touch tmp/restart.txt"
-
-`before_pull` and `after_pull` are respectively executed before and after pulling language files.
+This feature was extracted out to a separate gem. See [web_translate_it_server](https://github.com/AtelierConvivialite/web_translate_it_server).
 
 # License
 

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
-:minor: 8
-:patch: 4
+:minor: 9
+:patch: 0
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70301606155960 !ruby/object:Gem::Requirement
+  requirement: &70172331071400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70301606155960
+  version_requirements: *70172331071400
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70301606155360 !ruby/object:Gem::Requirement
+  requirement: &70172331070900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70301606155360
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70301606154700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *70301606154700
+  version_requirements: *70172331070900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301606153740 !ruby/object:Gem::Requirement
+  requirement: &70172331070440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70301606153740
+  version_requirements: *70172331070440
 description: 
 email: edouard@atelierconvivialite.com
 executables:
@@ -74,13 +63,10 @@ files:
 - lib/web_translate_it/command_line.rb
 - lib/web_translate_it/configuration.rb
 - lib/web_translate_it/project.rb
-- lib/web_translate_it/public/screen.css
-- lib/web_translate_it/server.rb
 - lib/web_translate_it/translation_file.rb
 - lib/web_translate_it/util/array_util.rb
 - lib/web_translate_it/util/string_util.rb
 - lib/web_translate_it/util.rb
-- lib/web_translate_it/views/index.erb
 - lib/web_translate_it.rb
 - generators/webtranslateit/lib/insert_commands.rb
 - generators/webtranslateit/webtranslateit_generator.rb
@@ -117,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A CLI to sync locale files with webtranslateit.com.

data/lib/web_translate_it/public/screen.css

@@ -1,246 +0,0 @@
-/*****************************************************************************/
-/*
-/* Common
-/*
-/*****************************************************************************/
-
-/* Global Reset */
-
-* {
-  margin: 0;
-  padding: 0;
-}
-
-html, body {
-  height: 100%;
-}
-
-body {
-  background-color: white;
-  font: 13.34px helvetica, arial, clean, sans-serif;
-  *font-size: small;
-  text-align: center;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  font-size: 100%;
-}
-
-h1 {
-  margin-bottom: 1em;
-}
-
-h1 a {
-  text-decoration: none;
-  color: #000;
-}
-
-.failed, .color31 {
-  color: red !important;
-}
-
-.worked, .color32 {
-  color: green !important;
-}
-
-.errored, .color33 {
-  color: yellow !important;
-}
-
-p {
-  margin: 1em 0;
-}
-
-.update {
-	background-color: #DFF2BF;
-	border: 2px solid #4F8A10;
-	padding: 5px;
-	width: 300px;
-	line-height: 30px;
-	text-align: center;
-}
-
-select, input {
-	font-size: 16px;
-}
-
-a {
-  color: #00a;
-}
-
-a:hover {
-  color: black;
-}
-
-a:visited {
-  color: #a0a;
-}
-
-table {
-  font-size: inherit;
-  font: 100%;
-  border-collapse: collapse;
-}
-
-th {
-  text-align: center;
-  padding-right: 1em;
-}
-
-tr {
-  border-bottom: 1px solid #CCC;
-}
-
-td {
-  padding: .5em 1em;
-}
-
-.information {
-  background-color: #ffffc0;
-  color: #333;
-  padding: 5px;
-}
-
-/*****************************************************************************/
-/*
-/* Home
-/*
-/*****************************************************************************/
-
-ul.posts {
-  list-style-type: none;
-  margin-bottom: 2em;
-}
-
-  ul.posts li {
-    line-height: 1.75em;
-  }
- 
-  ul.posts .date,
-  ul.posts .duration {
-    color: #aaa;
-    font-family: Monaco, "Courier New", monospace;
-    font-size: 80%;
-  }
-
-/*****************************************************************************/
-/*
-/* Site
-/*
-/*****************************************************************************/
-
-.site {
-  font-size: 110%;
-  text-align: justify;
-  width: 80%;
-  margin: 3em auto 2em auto;
-  line-height: 1.5em;
-}
-
-.title {
-  color: #a00;
-  font-weight: bold;
-  margin-bottom: 2em;
-}
-
-  .site .title a {
-    color: #a00;
-    text-decoration: none;
-  }
-
-  .site .title a:hover {
-    color: black;
-  }
-
-  .site .title .extra {
-    color: #aaa;
-    text-decoration: none;
-    margin-left: 1em;
-    font-size: 0.9em;
-  }
-
-  .site .title a.extra:hover {
-    color: black;
-  }
-
-  .site .meta {
-    color: #aaa;
-  }
-
-  .site .footer {
-    font-size: 80%;
-    color: #666;
-    border-top: 4px solid #eee;
-    margin-top: 2em;
-    overflow: hidden;
-  }
-
-    .site .footer .contact {
-      float: left;
-      margin-right: 3em;
-    }
-
-      .site .footer .contact a {
-        color: #8085C1;
-      }
-
-    .site .footer .rss {
-      margin-top: 1.1em;
-      margin-right: -.2em;
-      float: right;
-    }
-
-      .site .footer .rss img {
-        border: 0;
-      }
-
-/*****************************************************************************/
-/*
-/* Posts
-/*
-/*****************************************************************************/
-
-#post {
-
-}
-
-/* standard */
-
-#post pre {
-  border: 1px solid #ddd;
-  background-color: #eef;
-  padding: 0 .4em;
-}
-
-#post ul,
-#post ol {
-  margin-left: 1.25em;
-}
-
-#post code {
-  border: 1px solid #ddd;
-  background-color: #eef;
-  font-size: 95%;
-  padding: 0 .2em;
-}
-
-  #post pre code {
-    border: none;
-  }
-
-/* terminal */
-
-pre.terminal {
-  border: 1px solid black;
-  background-color: #333;
-  color: white;
-  padding: 5px;
-  overflow: auto;
-  word-wrap: break-word;
-}
-
-pre.terminal code {
-  font-family: 'Bitstream Vera Sans Mono', 'Courier', monospace;
-  background-color: #333;
-}
-

data/lib/web_translate_it/server.rb

@@ -1,57 +0,0 @@
-# encoding: utf-8
-require 'sinatra/base'
-require 'erb'
-
-module WebTranslateIt
-  class Server < Sinatra::Base
-    attr_reader :config
-    
-    dir = File.dirname(File.expand_path(__FILE__))
-
-    set :views,  "#{dir}/views"
-    set :public, "#{dir}/public"
-    set :static, true
-    set :lock, true
-        
-    helpers do
-      def wti_root
-        ""
-      end
-      
-      def highlight(value, expected)
-        return if value.nil?
-        print_value = value == true ? "Yes" : "No"
-        value == expected ? "<em>#{print_value}</em>" : "<em class=\"information\">#{print_value}</em>"
-      end
-    end
-    
-    get '/' do
-      @config = WebTranslateIt::Configuration.new('.')
-      erb :index, :locals => { :config => config, :locale => "" }
-    end
-    
-    get '/:locale' do
-      @config = WebTranslateIt::Configuration.new('.')
-      erb :index, :locals => { :config => config, :locale => params[:locale] }
-    end
-    
-    post '/pull/' do
-      `wti pull`
-      redirect "/"
-    end
-    
-    post '/pull/:locale' do
-      `wti pull -l #{params[:locale]}`
-      redirect "/#{params[:locale]}"
-    end
-    
-    def self.start(host, port)
-      puts "Starting wti server..."
-      Dir::mkdir('log') unless FileTest::directory?('log')
-      logger = ::File.open("log/webtranslateit.log", "a+")
-      STDOUT.reopen(logger)
-      STDERR.reopen(logger)
-      WebTranslateIt::Server.run! :host => host, :port => port
-    end
-  end
-end

data/lib/web_translate_it/views/index.erb

@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link href="<%= wti_root %>/screen.css" media="screen" rel="stylesheet" type="text/css" />
-    <link rel="shortcut icon" href="<%= wti_root %>/favicon.ico" type="image/x-icon" />
-    <title>Web Translate It Synchronisation Console</title>
-  </head>
-  <body>
-    <div class="site">
-      <div class="title">
-        <a href="<%= wti_root %>/">Web Translate It Synchronisation Console</a>
-      </div>
-
-      <div id="home">
-        <h1>Update</h1>
-        
-        <div class="update">
-          Download files update for 
-          <select name="locale" onchange="window.location=this.value;">
-            <option value="/" <%= "selected='true'" if locale == "" %>>All locales</option>
-            <% config.target_locales.each do |l| %>
-              <option value="/<%= l %>" <%= "selected='true'" if locale == l %>><%= l.upcase %></option>
-            <% end %>
-          </select>
-          <form method="post" action="<%= wti_root %>/pull/<%= locale %>">
-            <input type="submit" value="Update" onclick="if (window.hiddenCommit) { window.hiddenCommit.setAttribute('value', this.value); }else { hiddenCommit = document.createElement('input');hiddenCommit.type = 'hidden';hiddenCommit.value = this.value;hiddenCommit.name = this.name;this.form.appendChild(hiddenCommit); }this.setAttribute('originalValue', this.value);this.disabled = true;this.value='Please wait...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue');this.disabled = false; }return result;" />
-          </form>
-          <div class="clear"></div>
-        </div>
-                
-        <% if config.before_pull %>
-        <p>
-          This command will be executed before pulling files:
-          <code><%= config.before_pull %></code>
-        </p>
-        <% end %>
-        <% if config.after_pull %>
-          <p>
-            This command will be executed after pulling files:
-            <code><%= config.after_pull %></code>
-          </p>
-        <% end %>
-      </div>
-
-      <div class="footer">
-        <div class="contact">
-          <p>
-            <a href="http://docs.webtranslateit.com">Documentation</a><br/>
-            <a href="https://github.com/AtelierConvivialite/webtranslateit/">Source</a><br/>
-            <a href="https://github.com/AtelierConvivialite/webtranslateit/issues">Issues</a><br/>
-            <a href="http://twitter.com/webtranslateit">Twitter</a>
-          </p>
-        </div>
-        <div class="contact">
-          <p>
-            wti v.<%= WebTranslateIt::Util.version %><br/>
-            Built with <a href="http://sinatrarb.com/">Sinatra</a>
-          </p>
-        </div>        
-      </div>
-    </div>
-  </body>
-</html>