Merge lp:~tyler-baker/lava-dashboard/lava-tool-update into lp:lava-dashboard

Proposed by Tyler Baker on 2013-09-04
Status: Merged
Merged at revision: 419
Proposed branch: lp:~tyler-baker/lava-dashboard/lava-tool-update
Merge into: lp:lava-dashboard
Diff against target: 65 lines (+8/-8)
3 files modified
dashboard_app/templates/dashboard_app/bundle_detail.html (+2/-2)
dashboard_app/templates/dashboard_app/data_view_list.html (+2/-2)
setup-dev-env.sh (+4/-4)
To merge this branch: bzr merge lp:~tyler-baker/lava-dashboard/lava-tool-update
Reviewer Review Type Date Requested Status
Antonio Terceiro 2013-09-04 Approve on 2013-09-04
Review via email: mp+183927@code.launchpad.net

Description of the change

Replace all instances of lava-dashboard-tool with lava-tool. It's confusing to reference deprecated tools, so lets update the text.

To post a comment you must log in.
Antonio Terceiro (terceiro) wrote :

LGTM

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dashboard_app/templates/dashboard_app/bundle_detail.html'
2--- dashboard_app/templates/dashboard_app/bundle_detail.html 2013-02-25 04:52:22 +0000
3+++ dashboard_app/templates/dashboard_app/bundle_detail.html 2013-09-04 16:45:37 +0000
4@@ -59,9 +59,9 @@
5 <p>You can download this bundle with the following command:</p>
6 <div class="console">
7 {% if bundle.private %}
8- <code>lava-dashboard-tool get --dashboard-url=http://{{request.user.username}}@{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
9+ <code>lava-tool get --dashboard-url=http://{{request.user.username}}@{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
10 {% else %}
11- <code>lava-dashboard-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
12+ <code>lava-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
13 {% endif %}
14 </div>
15 {% endblock %}
16
17=== modified file 'dashboard_app/templates/dashboard_app/data_view_list.html'
18--- dashboard_app/templates/dashboard_app/data_view_list.html 2011-07-22 00:17:19 +0000
19+++ dashboard_app/templates/dashboard_app/data_view_list.html 2013-09-04 16:45:37 +0000
20@@ -9,8 +9,8 @@
21 class="ui-icon ui-icon-info"
22 style="float: left; margin-right: 0.3em;"></span>
23 <strong>Hint:</strong> To call a data view use the
24- <code>lava-dashboard-tool</code> command. See
25- <code>lava-dashboard-tool query-data-view --help</code>
26+ <code>lava-tool</code> command. See
27+ <code>lava-tool query-data-view --help</code>
28 to get started.
29 </div>
30 </div>
31
32=== modified file 'setup-dev-env.sh'
33--- setup-dev-env.sh 2011-09-30 23:45:49 +0000
34+++ setup-dev-env.sh 2013-09-04 16:45:37 +0000
35@@ -11,7 +11,7 @@
36 PORT=8000
37 fi
38 fi
39-# Setup dashboard URL for lava-dashboard-tool
40+# Setup dashboard URL for lava-tool
41 export DASHBOARD_URL=http://localhost:$PORT/dashboard
42 # Find root directory
43 ROOT="$(bzr root)"
44@@ -69,18 +69,18 @@
45 echo " * waiting for server to start up"
46 sleep 5
47 echo " * creating bundle stream for example data"
48- lava-dashboard-tool make-stream /anonymous/examples/ --name "Demo content loaded from examples/bundles"
49+ lava-tool make-stream /anonymous/examples/ --name "Demo content loaded from examples/bundles"
50 for BUNDLE_PATHNAME in $ROOT/examples/bundles/*.json; do
51 BUNDLE=$(basename $BUNDLE_PATHNAME .json)
52 echo " * importing bundle: $BUNDLE"
53- lava-dashboard-tool put $BUNDLE_PATHNAME >/dev/null
54+ lava-tool put $BUNDLE_PATHNAME >/dev/null
55 done
56 for BUNDLE_PATHNAME in $ROOT/examples/bundles/templates/*.json; do
57 BUNDLE=$(basename $BUNDLE_PATHNAME .json)
58 echo " * importing bundle template: $BUNDLE"
59 for i in $(seq 1 20); do
60 sed "$BUNDLE_PATHNAME" -e "s!@TEMPLATE@!$(printf %04d $i)!g" > "$i-$BUNDLE"
61- lava-dashboard-tool put "$i-$BUNDLE" /anonymous/examples/ >/dev/null
62+ lava-tool put "$i-$BUNDLE" /anonymous/examples/ >/dev/null
63 rm -f "$i-$BUNDLE"
64 done
65 done

Subscribers

People subscribed via source and target branches